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

IDE: Don't try to draw image for dividers in ToolbarConfig dialog. Issue #33533, patch from FTurtle.

Browse Source 
git-svn-id: trunk@57582 -
This commit is contained in:
juha 2018-03-31 14:09:43 +00:00
parent 5e2d878e09
commit 9d840e6fad
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ide/toolbarconfig.pas
View File

@ -83,7 +83,6 @@ type
private private
Image: TBitMap; Image: TBitMap;
defImageIndex: integer; defImageIndex: integer;
divImageIndex: Integer;
procedure AddCommand; procedure AddCommand;
procedure AddDivider; procedure AddDivider;
procedure AddTailItem; procedure AddTailItem;
@ -178,7 +177,7 @@ begin
TIDEImages.AssignImage(btnRemove.Glyph, 'arrow__darkred_left'); TIDEImages.AssignImage(btnRemove.Glyph, 'arrow__darkred_left');
TIDEImages.AssignImage(btnMoveUp.Glyph, 'arrow__darkgreen_up'); TIDEImages.AssignImage(btnMoveUp.Glyph, 'arrow__darkgreen_up');
TIDEImages.AssignImage(btnMoveDown.Glyph, 'arrow__darkgreen_down'); TIDEImages.AssignImage(btnMoveDown.Glyph, 'arrow__darkgreen_down');
TIDEImages.AssignImage(btnAddDivider.Glyph, 'menu_divider16'); //TIDEImages.AssignImage(btnAddDivider.Glyph, 'menu_divider16'); // uncomment if 'menu_divider16' exists (currently not)
TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel'); TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel');
btnAddDivider.Caption := '---'; btnAddDivider.Caption := '---';
@ -192,8 +191,6 @@ begin
lvToolbar.SmallImages := IDEImages.Images_16; lvToolbar.SmallImages := IDEImages.Images_16;
// default image to be used when none is available // default image to be used when none is available
defImageIndex := IDEImages.LoadImage('execute'); defImageIndex := IDEImages.LoadImage('execute');
// Image for divider
divImageIndex := IDEImages.Images_16.Add(btnAddDivider.Glyph,nil);
Image := TBitmap.Create; Image := TBitmap.Create;
SetupCaptions; SetupCaptions;
@ -330,7 +327,7 @@ var
lvItem: TListItem; lvItem: TListItem;
begin begin
lvItem := NewLvItem(cIDEToolbarDivider); lvItem := NewLvItem(cIDEToolbarDivider);
lvItem.ImageIndex := divImageIndex; lvItem.ImageIndex := -1;
InsertItem(lvItem); InsertItem(lvItem);
UpdateButtonsState; UpdateButtonsState;
end; end;
@ -509,7 +506,7 @@ var
begin begin
lvItem := lvToolbar.Items.Add; lvItem := lvToolbar.Items.Add;
lvItem.Caption := cIDEToolbarDivider; lvItem.Caption := cIDEToolbarDivider;
lvItem.ImageIndex := divImageIndex; lvItem.ImageIndex := -1;
end; end;
procedure TToolBarConfig.AddTailItem; procedure TToolBarConfig.AddTailItem;