paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-12 04:36:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

multiselection markers are now painted on DesignerDC

Browse Source 
git-svn-id: trunk@5055 -
This commit is contained in:
mattias 2004-01-12 16:05:10 +00:00
parent 383c1ee5f1
commit bb399170dd
2 changed files with 101 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
designer/controlselection.pp
View File

@ -95,7 +95,8 @@ type
TSelectedControlFlag = (
scfParentInSelection,
scfChildInSelection
scfChildInSelection,
scfMarkersPainted
);
TSelectedControlFlags = set of TSelectedControlFlag;
@ -110,6 +111,7 @@ type
FDesignerForm: TCustomForm;
FFlags: TSelectedControlFlags;
FIsTControl: boolean;
FMarkerPaintedBounds: TRect;
FOldLeft: integer;
FOldTop: integer;
FOldWidth: integer;
@ -127,7 +129,6 @@ type
procedure SetWidth(AWidth: integer);
function GetHeight: integer;
procedure SetHeight(AHeight: integer);
procedure SetFlags(const AValue: TSelectedControlFlags);
public
constructor Create(AnOwner: TControlSelection; AComponent: TComponent);
destructor Destroy; override;
@ -152,10 +153,11 @@ type
property OldHeight:integer read FOldHeight write FOldHeight;
property OldFormRelativeLeftTop: TPoint
read FOldFormRelativeLeftTop write FOldFormRelativeLeftTop;
property Flags: TSelectedControlFlags read FFlags write SetFlags;
property Flags: TSelectedControlFlags read FFlags write FFlags;
property UseCache: boolean read FUseCache write SetUseCache;
property IsTControl: boolean read FIsTControl;
property DesignerForm: TCustomForm read FDesignerForm;
property MarkerPaintedBounds: TRect read FMarkerPaintedBounds write FMarkerPaintedBounds;
end;
@ -310,6 +312,7 @@ type
procedure DoApplyUserBounds;
procedure UpdateRealBounds;
procedure UpdateParentChildFlags;
procedure DoDrawMarker(Index: integer; DC: TDesignerDeviceContext);
// snapping
function CleanGridSizeX: integer;
@ -409,7 +412,9 @@ type
procedure DrawMarker(AComponent: TComponent; DC: TDesignerDeviceContext);
procedure DrawMarkerAt(DC: TDesignerDeviceContext;
ALeft, ATop, AWidth, AHeight: integer);
procedure DrawMarkers(DC: TDesignerDeviceContext);
property ActiveGrabber: TGrabber read FActiveGrabber write SetActiveGrabber;
procedure InvalidateMarkersForComponent(AComponent: TComponent);
// user wished bounds:
property Left:integer read FLeft;
@ -621,12 +626,6 @@ begin
Result:=GetComponentLeft(FComponent);
end;
procedure TSelectedControl.SetFlags(const AValue: TSelectedControlFlags);
begin
if FFlags=AValue then exit;
FFlags:=AValue;
end;
procedure TSelectedControl.SetLeft(ALeft: integer);
begin
if FIsTControl then
@ -1065,6 +1064,33 @@ begin
Exclude(FStates,cssParentChildFlagsNeedUpdate);
end;
procedure TControlSelection.DoDrawMarker(Index: integer;
DC: TDesignerDeviceContext);
var
CompLeft, CompTop, CompWidth, CompHeight: integer;
CompOrigin, DCOrigin: TPoint;
CurItem: TSelectedControl;
AComponent: TComponent;
begin
CurItem:=Items[Index];
AComponent:=CurItem.Component;
GetComponentBounds(AComponent,CompLeft,CompTop,CompWidth,CompHeight);
CompOrigin:=GetParentFormRelativeParentClientOrigin(AComponent);
DCOrigin:=DC.FormOrigin;
CompLeft:=CompLeft+CompOrigin.X-DCOrigin.X;
CompTop:=CompTop+CompOrigin.Y-DCOrigin.Y;
{writeln('DoDrawMarker A ',FForm.Name
,' Component',AComponent.Name,',',CompLeft,',',CompLeft
,' DCOrigin=',DCOrigin.X,',',DCOrigin.Y
);}
DrawMarkerAt(DC,CompLeft,CompTop,CompWidth,CompHeight);
CurItem.Flags:=CurItem.Flags+[scfMarkersPainted];
CurItem.MarkerPaintedBounds:=Bounds(CompLeft,CompTop,CompWidth,CompHeight);
end;
function TControlSelection.CleanGridSizeX: integer;
begin
Result:=EnvironmentOptions.GridSizeX;
@ -2038,30 +2064,72 @@ begin
DC.Canvas.Brush.Color:=OldBrushColor;
end;
procedure TControlSelection.DrawMarkers(DC: TDesignerDeviceContext);
var
i: Integer;
AComponent: TComponent;
begin
if (Count<2) or (FForm=nil) then exit;
for i:=0 to Count-1 do begin
AComponent:=Items[i].Component;
if (AComponent=FLookupRoot)
or ComponentIsInvisible(AComponent) then continue;
DoDrawMarker(i,DC);
end;
end;
procedure TControlSelection.InvalidateMarkersForComponent(AComponent: TComponent
);
procedure InvalidateMarker(x,y: integer);
var
R: TRect;
begin
R:=Rect(x,y,x+MarkerSize,y+MarkerSize);
InvalidateRect(FForm.Handle,@R,true);
end;
var
i: Integer;
CurItem: TSelectedControl;
ComponentBounds: TRect;
LeftMarker: Integer;
TopMarker: Integer;
RightMarker: Integer;
BottomMarker: Integer;
begin
if (FForm=nil) then exit;
i:=IndexOf(AComponent);
if (i>=0) then begin
CurItem:=Items[i];
if scfMarkersPainted in CurItem.Flags then begin
ComponentBounds:=CurItem.MarkerPaintedBounds;
LeftMarker:=ComponentBounds.Left;
TopMarker:=ComponentBounds.Top;
RightMarker:=ComponentBounds.Right-MarkerSize;
BottomMarker:=ComponentBounds.Bottom-MarkerSize;
InvalidateMarker(LeftMarker,TopMarker);
InvalidateMarker(LeftMarker,BottomMarker);
InvalidateMarker(RightMarker,TopMarker);
InvalidateMarker(RightMarker,BottomMarker);
CurItem.Flags:=CurItem.Flags-[scfMarkersPainted];
end;
end;
end;
procedure TControlSelection.DrawMarker(AComponent: TComponent;
DC: TDesignerDeviceContext);
var
CompLeft, CompTop, CompWidth, CompHeight: integer;
CompOrigin, DCOrigin: TPoint;
i: Integer;
begin
if (Count<2)
or (FForm=nil)
or (AComponent=FLookupRoot)
or (not IsSelected(AComponent))
or ComponentIsInvisible(AComponent) then exit;
GetComponentBounds(AComponent,CompLeft,CompTop,CompWidth,CompHeight);
CompOrigin:=GetParentFormRelativeParentClientOrigin(AComponent);
DCOrigin:=DC.FormOrigin;
CompLeft:=CompLeft+CompOrigin.X-DCOrigin.X;
CompTop:=CompTop+CompOrigin.Y-DCOrigin.Y;
{writeln('DrawMarker A ',FForm.Name
,' Component',AComponent.Name,',',CompLeft,',',CompLeft
,' DCOrigin=',DCOrigin.X,',',DCOrigin.Y
);}
DrawMarkerAt(DC,CompLeft,CompTop,CompWidth,CompHeight);
or (AComponent=FLookupRoot) then exit;
i:=IndexOf(AComponent);
if i<0 then exit;
if ComponentIsInvisible(AComponent) then exit;
DoDrawMarker(i,DC);
end;
procedure TControlSelection.DrawRubberband(DC: TDesignerDeviceContext);

17
designer/designer.pp
View File

@ -916,18 +916,10 @@ begin
PaintClientGrid(TWinControl(Sender),DDC);
end;
// marker (multi selection markers)
if (ControlSelection.SelectionForm=Form)
and (ControlSelection.IsSelected(Sender)) then begin
ControlSelection.DrawMarker(Sender,DDC);
end;
//writeln('TDesigner.PaintControl NOT Drawing items');
//DoPaintDesignerItems;
// clean up
DDC.Clear;
end;
//writeln('TDesigner.PaintControl END ',Sender.Name);
//writeln('TDesigner.PaintControl END ',Sender.Name);
if not OldDuringPaintControl then
Exclude(FFlags,dfDuringPaintControl);
@ -948,6 +940,7 @@ begin
FOnPropertiesChanged(Self);
end;
ControlSelection.InvalidateGuideLinesCache;
ControlSelection.InvalidateMarkersForComponent(Sender);
end;
end;
@ -964,6 +957,7 @@ begin
FOnPropertiesChanged(Self);
end;
ControlSelection.InvalidateGuideLinesCache;
ControlSelection.InvalidateMarkersForComponent(Sender);
end;
end;
@ -2061,8 +2055,9 @@ end;
procedure TDesigner.DoPaintDesignerItems;
begin
// marker (multi selection markers)
if (ControlSelection.SelectionForm=Form) then begin
// ToDo: draw all markers
if (ControlSelection.SelectionForm=Form)
and (ControlSelection.Count>1) then begin
ControlSelection.DrawMarkers(DDC);
end;
// non visual component icons
DrawNonVisualComponents(DDC);