paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-07-08 23:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE / Designer: Formatting

Browse Source 
git-svn-id: trunk@33523 -
This commit is contained in:
juha 2011-11-14 09:33:03 +00:00
parent ab94abe6d8
commit 241f651b88
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
designer/designer.pp
View File

@ -1881,8 +1881,7 @@ begin
{$ENDIF} {$ENDIF}
end; end;
procedure TDesigner.MouseUpOnControl(Sender : TControl; procedure TDesigner.MouseUpOnControl(Sender : TControl; var TheMessage:TLMMouse);
var TheMessage:TLMMouse);
var var
NewLeft, NewTop, NewWidth, NewHeight: Integer; NewLeft, NewTop, NewWidth, NewHeight: Integer;
Button: TMouseButton; Button: TMouseButton;
@ -2000,7 +1999,6 @@ var
// modified // modified
Modified; Modified;
// set initial properties // set initial properties
if NewComponent is TControl then begin if NewComponent is TControl then begin
NewControl:=TControl(NewComponent); NewControl:=TControl(NewComponent);
@ -2109,8 +2107,7 @@ begin
SetCaptureControl(nil); SetCaptureControl(nil);
// check if the message is for the designed form // check if the message is for the designed form and there was a mouse down before
// and there was a mouse down before
DesignSender:=GetDesignControl(Sender); DesignSender:=GetDesignControl(Sender);
SenderParentForm:=GetParentForm(DesignSender); SenderParentForm:=GetParentForm(DesignSender);
//DebugLn(['TDesigner.MouseUpOnControl DesignSender=',dbgsName(DesignSender),' SenderParentForm=',dbgsName(SenderParentForm),' ',TheMessage.XPos,',',TheMessage.YPos]); //DebugLn(['TDesigner.MouseUpOnControl DesignSender=',dbgsName(DesignSender),' SenderParentForm=',dbgsName(SenderParentForm),' ',TheMessage.XPos,',',TheMessage.YPos]);
@ -2198,13 +2195,11 @@ begin
end; end;
DisableRubberBand; DisableRubberBand;
LastMouseMovePos.X:=-1; LastMouseMovePos.X:=-1;
if (not ControlSelection.OnlyVisualComponentsSelected and ShowComponentCaptions) or if (not ControlSelection.OnlyVisualComponentsSelected and ShowComponentCaptions)
(dfHasSized in FFlags) then or (dfHasSized in FFlags) then
Form.Invalidate; Form.Invalidate;
Exclude(FFlags,dfHasSized); Exclude(FFlags,dfHasSized);
MouseDownComponent:=nil; MouseDownComponent:=nil;
MouseDownSender:=nil; MouseDownSender:=nil;
{$IFDEF VerboseDesigner} {$IFDEF VerboseDesigner}

9
ide/main.pp
View File

@ -1809,7 +1809,8 @@ begin
SaveIncludeLinks; SaveIncludeLinks;
InputHistories.Save; InputHistories.Save;
PkgBoss.SaveSettings; PkgBoss.SaveSettings;
if TheControlSelection<>nil then TheControlSelection.Clear; if TheControlSelection<>nil then
TheControlSelection.Clear;
FreeIDEWindows; FreeIDEWindows;
end; end;
@ -9102,10 +9103,8 @@ begin
exit; exit;
end; end;
if (AnUnitInfo.Component<>nil) if (AnUnitInfo.Component<>nil) and (FLastFormActivated<>nil)
and (FLastFormActivated<>nil) and (TDesigner(FLastFormActivated.Designer).LookupRoot=AnUnitInfo.Component) then
and (TDesigner(FLastFormActivated.Designer).LookupRoot=AnUnitInfo.Component)
then
FLastFormActivated:=nil; FLastFormActivated:=nil;
// save some meta data of the source // save some meta data of the source