paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-11 13:19:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

formatting

Browse Source 
git-svn-id: trunk@21776 -
This commit is contained in:
paul 2009-09-20 04:42:57 +00:00
parent de15642a37
commit d6a6f487a7
3 changed files with 80 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
designer/controlselection.pp
View File

@ -620,16 +620,19 @@ var
OldBounds: TRect;
begin
if not FIsTComponent then exit;
if Owner.Mediator<>nil then begin
if Owner.Mediator <> nil then
begin
Owner.Mediator.GetBounds(TComponent(FPersistent),OldBounds);
ParentOffset:=Owner.Mediator.GetComponentOriginOnForm(TComponent(FPersistent));
dec(ParentOffset.X,OldBounds.Left);
dec(ParentOffset.Y,OldBounds.Top);
Owner.Mediator.SetBounds(TComponent(FPersistent),
Bounds(ALeft-ParentOffset.X,ATop-ParentOffset.Y,AWidth,AHeight));
end else begin
ParentOffset:=GetParentFormRelativeParentClientOrigin(TComponent(FPersistent));
SetBounds(ALeft-ParentOffset.X,ATop-ParentOffset.Y,AWidth,AHeight);
end
else
begin
ParentOffset := GetParentFormRelativeParentClientOrigin(TComponent(FPersistent));
SetBounds(ALeft - ParentOffset.X, ATop - ParentOffset.Y, AWidth, AHeight);
end;
end;

137
designer/designer.pp
View File

@ -176,6 +176,7 @@ type
procedure SelectParentOfSelection;
function DoCopySelectionToClipboard: boolean;
function GetPasteParent: TWinControl;
procedure DoModified;
function DoPasteSelectionFromClipboard(PasteFlags: TComponentPasteSelectionFlags
): boolean;
function DoInsertFromStream(s: TStream; PasteParent: TWinControl;
@ -951,6 +952,12 @@ begin
Result:=TWinControl(FLookupRoot);
end;
procedure TDesigner.DoModified;
begin
if Assigned(OnModified) then
OnModified(Self)
end;
function TDesigner.DoPasteSelectionFromClipboard(
PasteFlags: TComponentPasteSelectionFlags): boolean;
var
@ -2001,110 +2008,108 @@ var
DesignSender: TControl;
Handled: Boolean;
begin
GetMouseMsgShift(TheMessage,Shift,Button);
GetMouseMsgShift(TheMessage, Shift, Button);
if [dfShowEditorHints]*FFlags<>[] then
if [dfShowEditorHints] * FFlags <> [] then
begin
FHintTimer.Enabled := False;
// hide hint
FHintTimer.Enabled := Shift*[ssLeft,ssRight,ssMiddle]=[];
FHintTimer.Enabled := Shift * [ssLeft, ssRight, ssMiddle] = [];
if not (dfHasSized in FFlags) then
FHintWindow.Visible := False;
end;
DesignSender:=GetDesignControl(Sender);
DesignSender := GetDesignControl(Sender);
//DebugLn('TDesigner.MouseMoveOnControl Sender=',dbgsName(Sender),' ',dbgsName(DesignSender));
SenderParentForm:=GetParentForm(DesignSender);
if (SenderParentForm = nil) or (SenderParentForm <> Form) then exit;
SenderParentForm := GetParentForm(DesignSender);
if (SenderParentForm = nil) or (SenderParentForm <> Form) then Exit;
OldMouseMovePos:= LastMouseMovePos;
LastMouseMovePos:= GetFormRelativeMousePosition(Form);
if (OldMouseMovePos.X=LastMouseMovePos.X)
and (OldMouseMovePos.Y=LastMouseMovePos.Y) then exit;
OldMouseMovePos := LastMouseMovePos;
LastMouseMovePos := GetFormRelativeMousePosition(Form);
if (OldMouseMovePos.X = LastMouseMovePos.X) and (OldMouseMovePos.Y = LastMouseMovePos.Y) then
Exit;
if Mediator<>nil then begin
Handled:=false;
Mediator.MouseMove(Shift,LastMouseMovePos,Handled);
if Handled then exit;
if Mediator <> nil then
begin
Handled := False;
Mediator.MouseMove(Shift, LastMouseMovePos, Handled);
if Handled then Exit;
end;
if ControlSelection.SelectionForm=Form then
Grabber:=ControlSelection.GrabberAtPos(
LastMouseMovePos.X, LastMouseMovePos.Y)
if ControlSelection.SelectionForm = Form then
Grabber := ControlSelection.GrabberAtPos(LastMouseMovePos.X, LastMouseMovePos.Y)
else
Grabber:=nil;
Grabber := nil;
if MouseDownComponent=nil then begin
if MouseDownComponent = nil then
begin
if Grabber = nil then
ACursor:= crDefault
ACursor := crDefault
else begin
ACursor:= Grabber.Cursor;
ACursor := Grabber.Cursor;
end;
if ACursor<>LastFormCursor then begin
LastFormCursor:=ACursor;
if ACursor <> LastFormCursor then
begin
LastFormCursor := ACursor;
Form.SetTempCursor(ACursor);
end;
exit;
Exit;
end;
if (ControlSelection.SelectionForm=nil)
or (ControlSelection.SelectionForm=Form)
then begin
if Button=mbLeft then begin
// left button pressed
if (ControlSelection.ActiveGrabber<>nil) then begin
if (ControlSelection.SelectionForm = nil) or (ControlSelection.SelectionForm = Form) then
begin
if Button = mbLeft then // left button pressed
begin
if (ControlSelection.ActiveGrabber <> nil) then // grabber active => resizing
begin
// grabber moving -> size selection
if not (dfHasSized in FFlags) then begin
if not (dfHasSized in FFlags) then
begin
ControlSelection.SaveBounds;
Include(FFlags,dfHasSized);
Include(FFlags, dfHasSized);
end;
OldSnappedMousePos:=
ControlSelection.SnapGrabberMousePos(OldMouseMovePos);
CurSnappedMousePos:=
ControlSelection.SnapGrabberMousePos(LastMouseMovePos);
OldSnappedMousePos := ControlSelection.SnapGrabberMousePos(OldMouseMovePos);
CurSnappedMousePos:= ControlSelection.SnapGrabberMousePos(LastMouseMovePos);
ControlSelection.SizeSelection(
CurSnappedMousePos.X-OldSnappedMousePos.X,
CurSnappedMousePos.Y-OldSnappedMousePos.Y);
if Assigned(OnModified) then OnModified(Self);
end else begin
// no grabber active
SelectedCompClass:=GetSelectedComponentClass;
if (not ControlSelection.RubberBandActive)
and (SelectedCompClass=nil)
and (Shift=[ssLeft])
and (ControlSelection.Count>=1)
and (not ControlSelection.LookupRootSelected)
then begin
// move selection
if not (dfHasSized in FFlags) then begin
CurSnappedMousePos.X - OldSnappedMousePos.X,
CurSnappedMousePos.Y - OldSnappedMousePos.Y);
DoModified;
end
else
begin // no grabber active => moving
SelectedCompClass := GetSelectedComponentClass;
if (not ControlSelection.RubberBandActive) and
(SelectedCompClass=nil) and
(Shift=[ssLeft]) and
(ControlSelection.Count>=1) and
(not ControlSelection.LookupRootSelected) then
begin // move selection
if not (dfHasSized in FFlags) then
begin
ControlSelection.SaveBounds;
Include(FFlags,dfHasSized);
Include(FFlags, dfHasSized);
end;
//debugln('TDesigner.MouseMoveOnControl Move MouseDownComponent=',dbgsName(MouseDownComponent),' OldMouseMovePos=',dbgs(OldMouseMovePos),' MouseMovePos',dbgs(LastMouseMovePos),' MouseDownPos=',dbgs(MouseDownPos));
if ControlSelection.MoveSelectionWithSnapping(
LastMouseMovePos.X-MouseDownPos.X,LastMouseMovePos.Y-MouseDownPos.Y)
then begin
if Assigned(OnModified) then OnModified(Self);
end;
LastMouseMovePos.X - MouseDownPos.X,
LastMouseMovePos.Y - MouseDownPos.Y) then
DoModified;
end
else
begin
// rubberband sizing (selection or creation)
ControlSelection.RubberBandBounds:=Rect(MouseDownPos.X,MouseDownPos.Y,
LastMouseMovePos.X,
LastMouseMovePos.Y);
if SelectedCompClass=nil then
ControlSelection.RubberbandType:=rbtSelection
ControlSelection.RubberBandBounds := Rect(MouseDownPos.X, MouseDownPos.Y,
LastMouseMovePos.X, LastMouseMovePos.Y);
if SelectedCompClass = nil then
ControlSelection.RubberbandType := rbtSelection
else
ControlSelection.RubberbandType:=rbtCreating;
ControlSelection.RubberBandActive:=true;
ControlSelection.RubberbandType := rbtCreating;
ControlSelection.RubberBandActive := True;
end;
end;
end
else begin
else
ControlSelection.ActiveGrabber:=nil;
end;
end;
if [dfShowEditorHints, dfHasSized] * FFlags = [dfShowEditorHints, dfHasSized] then
HintTimer(Self);
@ -2408,7 +2413,7 @@ end;
procedure TDesigner.Modified;
Begin
ControlSelection.SaveBounds;
if Assigned(FOnModified) then FOnModified(Self);
DoModified;
end;
Procedure TDesigner.RemovePersistentAndChilds(APersistent: TPersistent);

4
lcl/include/control.inc
View File

@ -479,8 +479,8 @@ end;
Scale contorl by factor Multiplier/Divider
------------------------------------------------------------------------------}
Procedure TControl.ChangeScale(Multiplier, Divider: Integer);
Begin
procedure TControl.ChangeScale(Multiplier, Divider: Integer);
begin
// TODO: TCONTROL.CHANGESCALE
//Assert(False, 'Trace:TODO: [TControl.ChangeScale]');
end;