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

LazMapViewer: In TMapEditMark, move declarations of FPt, FMarquee, FMarqueeRect, and FLit from private to protected section. Rename FLit to FList. Issze #39114

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9674 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2025-03-11 13:54:25 +00:00
parent 6dcc628ea3
commit adc968308b
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
components/lazmapviewer/source/mvmapviewer.pas
View File

@ -878,14 +878,10 @@ type
FOnSelectionCompleted: TNotifyEvent;
FOnStartDrag: TNotifyEvent;
FRealPt: TRealPoint;
FPt: TPoint;
FSelection: TMapObjectList;
FObservedColls: TMapObjectList;
FLit: TMapObjectList;
FOrigins: TRealPointArray;
FDragStarted: Boolean;
FMarquee: Boolean;
FMarqueeRect: TRect;
FDirty: Boolean;
FTruncSelection: Boolean;
FClearSelection: Boolean;
@ -905,6 +901,12 @@ type
function AroundPt(X, Y: Integer; APt: TPoint): Boolean;
procedure SelectFromMarquee;
procedure MarkDirty;
protected
FPt: TPoint;
FMarquee: Boolean;
FMarqueeRect: TRect;
FList: TMapObjectList;
public
constructor Create(AMapView: TMapView);
destructor Destroy; override;
@ -4412,7 +4414,7 @@ end;
function TMapEditMark.GetCursorShape: TCursor;
begin
if (FCursorShape = crDefault) and Assigned(FLit)
if (FCursorShape = crDefault) and Assigned(FList)
then Result := crHandPoint
else Result := FCursorShape;
end;
@ -4617,7 +4619,7 @@ begin
DE.BrushStyle := bsSolid;
DE.Opacity := 1.0;
if Assigned(FLit) then
if Assigned(FList) then
DE.Rectangle(FPt.X - 5, FPt.Y - 5, FPt.X + 5, FPt.Y + 5);
if HasSelection then
@ -4664,17 +4666,17 @@ begin
if Assigned(AObjs) and (AObjs.Count > 0) and (AObjs[0] is TMapPoint) then
begin
// Same point?
if Assigned(FLit) and (AObjs[0] = FLit[0]) then
if Assigned(FList) and (AObjs[0] = FList[0]) then
Exit;
Lat := TMapPoint(AObjs[0]).Latitude;
Lon := TMapPoint(AObjs[0]).Longitude;
FLit.Free;
FLit := TMapObjectList.Create(AObjs);
FList.Free;
FList := TMapObjectList.Create(AObjs);
FMapView.Invalidate;
end
else if Assigned(FLit) then
else if Assigned(FList) then
begin
FreeAndNil(FLit);
FreeAndNil(FList);
FMapView.Invalidate;
end;
end;
@ -4696,7 +4698,7 @@ var
LeftOf: Boolean = False;
begin
Result := Nil;
for P in FLit.Points do
for P in FList.Points do
if not LeftOf and not FSelection.IsPresent(P) and (Result = Nil) then
Result := P
else if (P = P0) then
@ -4707,11 +4709,11 @@ var
begin
Result := True;
if Assigned(FLit) and AroundPt(X, Y, FPt) then
if Assigned(FList) and AroundPt(X, Y, FPt) then
begin
// Ctrl+click adds to selection
FTruncSelection := not (ssCtrl in GetKeyShiftState);
for O in FLit.Points do
for O in FList.Points do
if FSelection.IndexOfObj(O, I) then
begin
// Alt+click selects the point below
@ -4730,15 +4732,15 @@ begin
Exit;
end;
H := FSelection.DelIfPresent(FLit[0]);
H := FSelection.DelIfPresent(FList[0]);
FTruncSelection := not H and FTruncSelection;
FSelection.Insert(0, FLit[0]);
FSelection.Insert(0, FList[0]);
if not H then
ObserveItemColl(FLit[0]);
for O in FLit do
ObserveItemColl(FList[0]);
for O in FList do
if FSelection.AddIfNotPresent(O) then
ObserveItemColl(O);
FreeAndNil(FLit);
FreeAndNil(FList);
end
else
FClearSelection := not (ssCtrl in GetKeyShiftState);
@ -4755,7 +4757,7 @@ var
I: Integer = 0;
P: TMapPoint;
begin
FLit := Nil;
FList := Nil;
CompleteSelection;
SetLength(FOrigins, FSelection.Count);
for P in FSelection.Points do