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

Formatting, comment

Browse Source 
git-svn-id: trunk@52229 -
This commit is contained in:
juha 2016-04-21 20:40:00 +00:00
parent 2df36f2a8d
commit 6d991af10c
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/ideintf/propeditutils.pp
View File

@ -242,9 +242,9 @@ begin
DebugLn([' ',i,' ',dbgsName(Items[i])]); DebugLn([' ',i,' ',dbgsName(Items[i])]);
end; end;
function TPersistentSelectionList.IsEqual( function TPersistentSelectionList.IsEqual(SourceSelectionList: TPersistentSelectionList): boolean;
SourceSelectionList:TPersistentSelectionList):boolean; var
var a:integer; a: integer;
begin begin
if (SourceSelectionList=nil) and (Count=0) then begin if (SourceSelectionList=nil) and (Count=0) then begin
Result:=true; Result:=true;

15
designer/controlselection.pp
View File

@ -362,8 +362,7 @@ type
procedure UpdateRealBounds; procedure UpdateRealBounds;
procedure UpdateParentChildFlags; procedure UpdateParentChildFlags;
procedure DoDrawMarker(Index: integer; DC: TDesignerDeviceContext); procedure DoDrawMarker(Index: integer; DC: TDesignerDeviceContext);
procedure Notification(AComponent: TComponent; Operation: TOperation); procedure Notification(AComponent: TComponent; Operation: TOperation); override;
override;
// snapping // snapping
function CleanGridSizeX: integer; function CleanGridSizeX: integer;
@ -2141,9 +2140,9 @@ begin
end; end;
end; end;
function TControlSelection.GetParentFormRelativeBounds(AComponent: TComponent function TControlSelection.GetParentFormRelativeBounds(AComponent: TComponent): TRect;
): TRect; var
var R:TRect; R:TRect;
P : TPoint; P : TPoint;
begin begin
if FMediator <> nil then if FMediator <> nil then
@ -2161,8 +2160,7 @@ begin
Result:=TSelectedControl(FControls[Index]); Result:=TSelectedControl(FControls[Index]);
end; end;
procedure TControlSelection.SetItems(Index:integer; procedure TControlSelection.SetItems(Index:integer; ASelectedControl:TSelectedControl);
ASelectedControl:TSelectedControl);
begin begin
FControls[Index]:=ASelectedControl; FControls[Index]:=ASelectedControl;
end; end;
@ -2290,7 +2288,8 @@ begin
InvalidateGrabbers; InvalidateGrabbers;
InvalidateGuideLines; InvalidateGuideLines;
InvalidateMarkers; InvalidateMarkers;
for i:=0 to FControls.Count-1 do Items[i].Free; for i:=0 to FControls.Count-1 do
Items[i].Free;
FControls.Clear; FControls.Clear;
FStates:=FStates+cssSelectionChangeFlags-[cssLookupRootSelected]; FStates:=FStates+cssSelectionChangeFlags-[cssLookupRootSelected];
FForm:=nil; FForm:=nil;

3
designer/designer.pp
View File

@ -2236,8 +2236,7 @@ var
end; end;
if not Assigned(NewParent) then exit; if not Assigned(NewParent) then exit;
if not PropertyEditorHook.BeforeAddPersistent(Self, if not PropertyEditorHook.BeforeAddPersistent(Self, NewComponentClass, NewParent)
NewComponentClass,NewParent)
then begin then begin
DebugLn('Note: TDesigner.AddComponent BeforeAddPersistent failed: ComponentClass=', DebugLn('Note: TDesigner.AddComponent BeforeAddPersistent failed: ComponentClass=',
NewComponentClass.ClassName,' NewParent=',DbgSName(NewParent)); NewComponentClass.ClassName,' NewParent=',DbgSName(NewParent));

2
ide/main.pp
View File

@ -4972,7 +4972,7 @@ end;
procedure TMainIDE.ComponentPaletteClassSelected(Sender: TObject); procedure TMainIDE.ComponentPaletteClassSelected(Sender: TObject);
begin begin
// code below cant be handled correctly by integrated IDE // code below can't be handled correctly by integrated IDE
if (IDETabMaster = nil) and (Screen.CustomFormZOrderCount > 1) if (IDETabMaster = nil) and (Screen.CustomFormZOrderCount > 1)
and Assigned(Screen.CustomFormsZOrdered[1].Designer) then and Assigned(Screen.CustomFormsZOrdered[1].Designer) then
begin begin