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

cocoa: support for images for MenuItems (mainmenu, popupmenu). #33664

Browse Source 
git-svn-id: trunk@58889 -
This commit is contained in:
dmitry 2018-09-06 04:44:43 +00:00
parent b0e9ae1b0a
commit 5a3687fe08
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lcl/interfaces/cocoa/cocoawsmenus.pas
View File

@ -33,7 +33,7 @@ uses
// Widgetset
WSMenus, WSLCLClasses,
// LCL Cocoa
CocoaPrivate, CocoaWSCommon, CocoaUtils;
CocoaPrivate, CocoaWSCommon, CocoaUtils, CocoaGDIObjects;
type
@ -123,6 +123,7 @@ type
class function SetEnable(const AMenuItem: TMenuItem; const Enabled: boolean): boolean; override;
class function SetRadioItem(const AMenuItem: TMenuItem; const RadioItem: boolean): boolean; override;
//class function SetRightJustify(const AMenuItem: TMenuItem; const Justified: boolean): boolean; override;
class procedure UpdateMenuIcon(const AMenuItem: TMenuItem; const HasIcon: Boolean; const AIcon: TBitmap); override;
end;
{ TCocoaWSMenu }
@ -146,6 +147,7 @@ type
class procedure Popup(const APopupMenu: TPopupMenu; const X, Y: Integer); override;
end;
procedure NSMenuItemSetBitmap(mn: NSMenuItem; bmp: TBitmap);
implementation
@ -507,6 +509,9 @@ begin
// initial set of properties
item.setEnabled(AMenuItem.Enabled);
Do_SetCheck(item, AMenuItem.Checked);
if (AMenuItem.ImageIndex>=0) or (AMenuItem.HasBitmap) then
NSMenuItemSetBitmap(item, AMenuItem.Bitmap);
end;
Result:=HMENU(item);
@ -660,6 +665,26 @@ begin
NSMenuItem(AMenuItem.Handle).setState( menustate[RadioItem] );
end;
procedure NSMenuItemSetBitmap(mn: NSMenuItem; bmp: TBitmap);
begin
if not Assigned(mn) then Exit;
if not Assigned(bmp) or (bmp.Handle = 0) then
mn.setImage(nil)
else
mn.setImage(TCocoaBitmap(bmp.Handle).Image);
end;
class procedure TCocoaWSMenuItem.UpdateMenuIcon(const AMenuItem: TMenuItem;
const HasIcon: Boolean; const AIcon: TBitmap);
var
mn : NSMenuItem;
begin
if not Assigned(AMenuItem) or (AMenuItem.Handle=0) then Exit;
if NSObject(AMenuItem.Handle).isKindOfClass(NSMenuItem) then
NSMenuItemSetBitmap( NSMenuItem(AMenuItem.Handle), AIcon);
end;
{ TCocoaWSPopupMenu }
{------------------------------------------------------------------------------