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

IDE: Explode a with-block in code creating component palette buttons. Revealed a bug with PopupMenu.

Browse Source 
git-svn-id: trunk@47217 -
This commit is contained in:
juha 2014-12-17 23:27:23 +00:00
parent 00e9e556d4
commit 651c16ed62
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ide/componentpalette.pas
View File

@ -49,7 +49,7 @@ const
CompPalSelectionToolBtnPrefix = 'PaletteSelectBtn'; CompPalSelectionToolBtnPrefix = 'PaletteSelectBtn';
CompPaletteCompBtnPrefix = 'PaletteBtn'; CompPaletteCompBtnPrefix = 'PaletteBtn';
{$IFDEF VerboseComponentPalette} {$IFDEF VerboseComponentPalette}
CompPalVerbPgName = 'Standard'; CompPalVerbPgName = 'Additional'; //'Standard';
{$ENDIF} {$ENDIF}
type type
TComponentSelectionMode = ( TComponentSelectionMode = (
@ -504,7 +504,7 @@ end;
procedure TComponentPage.CreateOrDelButton(aComp: TPkgComponent; aButtonUniqueName: string); procedure TComponentPage.CreateOrDelButton(aComp: TPkgComponent; aButtonUniqueName: string);
var var
{%H-}Pal: TComponentPalette; Pal: TComponentPalette;
Btn: TSpeedButton; Btn: TSpeedButton;
begin begin
if aComp.Visible then begin if aComp.Visible then begin
@ -516,22 +516,20 @@ begin
Pal := TComponentPalette(Palette); Pal := TComponentPalette(Palette);
Btn := TSpeedButton.Create(nil); Btn := TSpeedButton.Create(nil);
aComp.Button:=Btn; aComp.Button:=Btn;
with Btn do begin Btn.Name := CompPaletteCompBtnPrefix + aButtonUniqueName + aComp.ComponentClass.ClassName;
Name := CompPaletteCompBtnPrefix + aButtonUniqueName + aComp.ComponentClass.ClassName; // Left and Top will be set in ReAlignButtons.
// Left and Top will be set in ReAlignButtons. Btn.SetBounds(Btn.Left,Btn.Top,ComponentPaletteBtnWidth,ComponentPaletteBtnHeight);
SetBounds(Left,Top,ComponentPaletteBtnWidth,ComponentPaletteBtnHeight); Btn.Glyph.Assign(aComp.Icon);
Glyph.Assign(aComp.Icon); Btn.GroupIndex := 1;
GroupIndex := 1; Btn.Flat := true;
Flat := true; Btn.OnMouseDown := @Pal.ComponentBtnMouseDown;
OnMouseDown := @Pal.ComponentBtnMouseDown; Btn.OnMouseUp := @Pal.ComponentBtnMouseUp;
OnMouseUp := @Pal.ComponentBtnMouseUp; Btn.OnDblClick := @Pal.ComponentBtnDblClick;
OnDblClick := @Pal.ComponentBtnDblClick; Btn.OnMouseWheel := @Pal.OnPageMouseWheel;
OnMouseWheel := @Pal.OnPageMouseWheel; Btn.ShowHint := EnvironmentOptions.ShowHintsForComponentPalette;
ShowHint := EnvironmentOptions.ShowHintsForComponentPalette; Btn.Hint := aComp.ComponentClass.ClassName + sLineBreak
Hint := aComp.ComponentClass.ClassName + sLineBreak + '(' + aComp.ComponentClass.UnitName + ')';
+ '(' + aComp.ComponentClass.UnitName + ')'; Btn.PopupMenu:=Pal.PopupMenu;
Btn.PopupMenu:=PopupMenu;
end;
{$IFDEF VerboseComponentPalette} {$IFDEF VerboseComponentPalette}
if aComp.RealPage.PageName = CompPalVerbPgName then if aComp.RealPage.PageName = CompPalVerbPgName then
DebugLn(['TComponentPalette.CreateOrDelButton Created Button: ',aComp.ComponentClass.ClassName,' ',aComp.Button.Name]); DebugLn(['TComponentPalette.CreateOrDelButton Created Button: ',aComp.ComponentClass.ClassName,' ',aComp.Button.Name]);