helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2026-08-15 13:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor: Simplify zoom functionality in MapOverlay by introducing NextStepScale method for smoother zoom transitions

Browse source
This commit is contained in:
BruceChen 2026-04-05 18:08:08 +08:00
parent 296070f7e4
commit 98ad174999
1 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

40
MinecraftClient/Tui/MapOverlay.cs
View file

@ -19,8 +19,8 @@ namespace MinecraftClient.Tui
/// </summary>
internal sealed class MapOverlay : Panel
{
private const double ZoomFactor = 1.25;
private const double MaxScale = 2.0;
private const double ZoomStep = 0.25;
private const double KeyPanStep = 4.0;
private const double OffsetEpsilon = 0.5;
@ -221,7 +221,25 @@ namespace MinecraftClient.Tui
_offsetY = Math.Clamp(_offsetY, 0, maxOffY);
}
private void ZoomAtCenter(double factor)
private double NextStepScale(bool zoomIn)
{
if (zoomIn)
{
double next = Math.Floor(_scale / ZoomStep + 1.0 - 1e-9) * ZoomStep;
if (next <= _scale + 1e-9)
next += ZoomStep;
return Math.Clamp(next, _fitScale, MaxScale);
}
else
{
double prev = Math.Ceiling(_scale / ZoomStep - 1.0 + 1e-9) * ZoomStep;
if (prev >= _scale - 1e-9)
prev -= ZoomStep;
return Math.Clamp(prev, _fitScale, MaxScale);
}
}
private void ZoomAtCenter(bool zoomIn)
{
if (_map?.Colors is null) return;
@ -231,12 +249,7 @@ namespace MinecraftClient.Tui
double centerMapX = _offsetX + (viewW / 2.0) / _scale;
double centerMapY = _offsetY + (viewPixelsH / 2.0) / _scale;
double newScale = Math.Clamp(_scale * factor, _fitScale, MaxScale);
if ((_scale < 1.0 - 1e-9 && newScale > 1.0 + 1e-9) ||
(_scale > 1.0 + 1e-9 && newScale < 1.0 - 1e-9))
newScale = 1.0;
double newScale = NextStepScale(zoomIn);
if (Math.Abs(newScale - _scale) < 1e-12)
return;
@ -358,8 +371,7 @@ namespace MinecraftClient.Tui
protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
{
double factor = e.Delta.Y > 0 ? ZoomFactor : 1.0 / ZoomFactor;
ZoomAtCenter(factor);
ZoomAtCenter(e.Delta.Y > 0);
e.Handled = true;
}
@ -420,12 +432,12 @@ namespace MinecraftClient.Tui
{
if (e.Text is "+" or "=")
{
ZoomAtCenter(ZoomFactor);
ZoomAtCenter(true);
e.Handled = true;
}
else if (e.Text is "-")
{
ZoomAtCenter(1.0 / ZoomFactor);
ZoomAtCenter(false);
e.Handled = true;
}
}
@ -441,12 +453,12 @@ namespace MinecraftClient.Tui
return;
case Key.Add:
ZoomAtCenter(ZoomFactor);
ZoomAtCenter(true);
e.Handled = true;
return;
case Key.Subtract:
ZoomAtCenter(1.0 / ZoomFactor);
ZoomAtCenter(false);
e.Handled = true;
return;