paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LazMapViewer: Restrict zoom level to allowed range. Part of issue #39111.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9665 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2025-03-08 21:28:25 +00:00
parent 637f4bbf66
commit d80d4c79f5
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/lazmapviewer/source/mvengine.pas
View File

@ -939,9 +939,7 @@ begin
Val := 1; Val := 1;
if WheelDelta < 0 then if WheelDelta < 0 then
Val := -1; Val := -1;
nZoom := Zoom + Val; nZoom := EnsureRange(Zoom + Val, FZoomMin, FZoomMax);
if (nZoom >= FZoomMin) and (nZoom <= FZoomMax) then
begin
if ZoomToCursor then if ZoomToCursor then
begin begin
MapWin.ZoomCenter := ScreenToLatLon(MousePos); MapWin.ZoomCenter := ScreenToLatLon(MousePos);
@ -949,7 +947,6 @@ begin
bZoomToCursor := True; bZoomToCursor := True;
end; end;
SetZoom(nZoom, bZoomToCursor); SetZoom(nZoom, bZoomToCursor);
end;
Handled := true; Handled := true;
end; end;
@ -1509,7 +1506,7 @@ begin
tmpWin := MapWin; tmpWin := MapWin;
tmpWin.Center.Lon := (aArea.TopLeft.Lon + aArea.BottomRight.Lon) / 2; tmpWin.Center.Lon := (aArea.TopLeft.Lon + aArea.BottomRight.Lon) / 2;
tmpWin.Center.Lat := (aArea.TopLeft.Lat + aArea.BottomRight.Lat) / 2; tmpWin.Center.Lat := (aArea.TopLeft.Lat + aArea.BottomRight.Lat) / 2;
tmpWin.Zoom := 18; tmpWin.Zoom := FZoomMax;
TopLeft.X := 0; TopLeft.X := 0;
TopLeft.Y := 0; TopLeft.Y := 0;
BottomRight.X := tmpWin.Width; BottomRight.X := tmpWin.Width;