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

cocoa: correct state image selection depending on type of the menu (radio or not)

Browse Source 
git-svn-id: trunk@60989 -
This commit is contained in:
dmitry 2019-04-16 00:11:37 +00:00
parent d7f986c747
commit 17b5600500
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -428,7 +428,6 @@ class procedure TCocoaWSMenuItem.Do_SetCheck(const ANSMenuItem: NSMenuItem; cons
const
menustate : array [Boolean] of NSInteger = (NSOffState, NSOnState);
begin
ANSMenuItem.setOnStateImage(NSMenuCheckmark);
ANSMenuItem.setState( menustate[Checked] );
end;
@ -550,6 +549,12 @@ begin
{$else}
item.setEnabled(AMenuItem.Enabled);
{$endif}
if AMenuItem.RadioItem then
item.setOnStateImage( NSMenuRadio )
else
item.setOnStateImage(NSMenuCheckmark);
Do_SetCheck(item, AMenuItem.Checked);
if AMenuItem.HasIcon and ((AMenuItem.ImageIndex>=0) or (AMenuItem.HasBitmap)) then
@ -715,7 +720,11 @@ begin
Result:=Assigned(AMenuItem) and (AMenuItem.Handle<>0);
if not Result then Exit;
//todo: disable relative radio items
NSMenuItem(AMenuItem.Handle).setOnStateImage( NSMenuRadio );
if RadioItem then
NSMenuItem(AMenuItem.Handle).setOnStateImage( NSMenuRadio )
else
NSMenuItem(AMenuItem.Handle).setOnStateImage(NSMenuCheckmark);
NSMenuItem(AMenuItem.Handle).setState( menustate[RadioItem] );
end;