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

IDE: Call ReAlignButtons only for the active page at the end of UpdateNoteBookButtons.

Browse Source 
git-svn-id: trunk@47115 -
This commit is contained in:
juha 2014-12-05 07:19:18 +00:00
parent 2c6049da98
commit 483871416f
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ide/componentpalette.pas
View File

@ -156,7 +156,7 @@ type
procedure Clear;
procedure ClearButtons;
procedure DoAfterComponentAdded; override;
procedure ReAlignButtons(aSheet: TCustomPage = Nil);
procedure ReAlignButtons(aSheet: TCustomPage);
procedure UpdateNoteBookButtons;
procedure OnGetNonVisualCompIcon(Sender: TObject;
AComponent: TComponent; var Icon: TCustomBitmap);
@ -835,17 +835,13 @@ var
Node: TAVLTreeNode;
ScrollBox: TScrollBox;
begin
if (FPageControl<>nil) and (aSheet=Nil) then
aSheet:=FPageControl.ActivePage; // Use ActivePage if nothing was given.
if (aSheet=Nil) or not aSheet.Visible then
exit;
{$IFDEF VerboseComponentPalette}
//if aSheet.Caption = CompPalVerbPgName then
DebugLn(['TComponentPalette.ReAlignButtons Visible="',aSheet.Caption,'", ClientWidth=',aSheet.ClientWidth]);
DebugLn(['TComponentPalette.ReAlignButtons Visible="',aSheet.Caption,'", ClientWidth=',aSheet.ClientWidth]);
{$ENDIF}
if FPageControl<>nil then begin
if FPageControl<>nil then
fPageControl.DisableAutoSizing{$IFDEF DebugDisableAutoSizing}('TComponentPalette.ReAlignButtons'){$ENDIF};
end;
ButtonTree:=nil;
try
if (aSheet.ComponentCount=0) or not (aSheet.Components[0] is TScrollBox) then
@ -1122,10 +1118,6 @@ begin
Comp := FindComponent(aCompNames[i]) as TPkgComponent;
CreateOrDelButton(Comp, Format('%d_%d_',[aPageIndex,i]), ScrollBox);
end;
{$IFDEF VerboseComponentPalette}
DebugLn('TComponentPalette.CreateButtons Calling ReAlignButtons');
{$ENDIF}
ReAlignButtons(Pg.PageComponent);
end;
procedure TComponentPalette.UpdateNoteBookButtons;
@ -1176,6 +1168,10 @@ begin
end
else if FPageControl.PageCount>0 then
FPageControl.PageIndex:=0;
{$IFDEF VerboseComponentPalette}
DebugLn('TComponentPalette.UpdateNoteBookButtons Calling ReAlignButtons');
{$ENDIF}
ReAlignButtons(FPageControl.ActivePage); // Align only the active page.
finally
// unlock
fUpdatingPageControl:=false;

4
ide/main.pp
View File

@ -4758,10 +4758,8 @@ begin
IDEOptionsDialog.WriteAll(false);
// Update component palette only when needed.
PaletteOpt := TCompPaletteOptionsFrame(IDEOptionsDialog.FindEditor(TCompPaletteOptionsFrame));
if Assigned(PaletteOpt) and PaletteOpt.ConfigChanged then begin
if Assigned(PaletteOpt) and PaletteOpt.ConfigChanged then
IDEComponentPalette.Update;
TComponentPalette(IDEComponentPalette).ReAlignButtons;
end;
// Update TaskBarBehavior immediately.
if EnvironmentOptions.SingleTaskBarButton then
Application.TaskBarBehavior := tbSingleButton