paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-01 06:49:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Menu designer: Refactor TShadowMenu.AddImageListIcon more.

Browse Source 
git-svn-id: trunk@53082 -
This commit is contained in:
juha 2016-10-08 17:44:59 +00:00
parent 4336f9fe8c
commit 6625ac8e9c
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
designer/menueditor.pp
View File

@ -201,7 +201,6 @@ type
procedure SetupPopupMenu; procedure SetupPopupMenu;
procedure StopEditingCaption; procedure StopEditingCaption;
procedure UpdateButtonGlyphs(isInBar: boolean); procedure UpdateButtonGlyphs(isInBar: boolean);
function UpdateImageIndex(anImageList: TCustomImageList): Boolean;
// user actions // user actions
procedure AddFromTemplate(Sender: TObject); procedure AddFromTemplate(Sender: TObject);
procedure AddImageListIcon(Sender: TObject); procedure AddImageListIcon(Sender: TObject);
@ -1447,35 +1446,25 @@ begin
end; end;
end; end;
function TShadowMenu.UpdateImageIndex(anImageList: TCustomImageList): Boolean;
var
idx: integer;
begin
idx := ChooseIconFromImageListDlg(anImageList);
if idx = -1 then Exit(False);
FSelectedMenuItem.ImageIndex := idx;
Result := True;
end;
procedure TShadowMenu.AddImageListIcon(Sender: TObject); procedure TShadowMenu.AddImageListIcon(Sender: TObject);
var var
idx: integer;
selected: TShadowItem; selected: TShadowItem;
UpdOk: Boolean;
begin begin
if FSelectedMenuItem = nil then Exit; if FSelectedMenuItem = nil then Exit;
UpdOk := False; idx := -1;
selected:=SelectedShadowItem; selected:=SelectedShadowItem;
if (FMenu.Images <> nil) then if (FMenu.Images <> nil) then
UpdOk := UpdateImageIndex(FMenu.Images) idx := ChooseIconFromImageListDlg(FMenu.Images)
else if (selected.Level > 0) else if (selected.Level > 0)
and (FSelectedMenuItem.Parent.SubMenuImages <> nil) then and (FSelectedMenuItem.Parent.SubMenuImages <> nil) then
UpdOk := UpdateImageIndex(FSelectedMenuItem.Parent.SubMenuImages); idx := ChooseIconFromImageListDlg(FSelectedMenuItem.Parent.SubMenuImages);
if UpdOk then begin if idx = -1 then Exit;
selected.Invalidate; FSelectedMenuItem.ImageIndex := idx;
UpdateActionsEnabledness; selected.Invalidate;
FEditorDesigner.PropertyEditorHook.RefreshPropertyValues; UpdateActionsEnabledness;
FEditorDesigner.Modified; FEditorDesigner.PropertyEditorHook.RefreshPropertyValues;
end; FEditorDesigner.Modified;
end; end;
procedure TShadowMenu.DeleteTemplate(Sender: TObject); procedure TShadowMenu.DeleteTemplate(Sender: TObject);