whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Empty icons and Cocoa menu items. 

Clear menu item's image if QImage is empty (isNull).

Task-number: QTBUG-39557
Change-Id: I8145b67342b0361da2bb945070603cc182202b71
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
bb10
Timur Pocheptsov 2014-06-30 10:31:01 +02:00
parent 4827623acb
commit 1529a3df95
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/platforms/cocoa/qcocoamenuitem.mm
View File

@ -329,12 +329,13 @@ NSMenuItem *QCocoaMenuItem::sync()
[m_native setKeyEquivalentModifierMask:NSCommandKeyMask];
}
NSImage *img = nil;
if (!m_icon.isNull()) {
NSImage *img = qt_mac_create_nsimage(m_icon);
img = qt_mac_create_nsimage(m_icon);
[img setSize:NSMakeSize(16, 16)];
[m_native setImage: img];
[img release];
}
[m_native setImage:img];
[img release];
[m_native setState:m_checked ? NSOnState : NSOffState];
return m_native;