diff options
| author | René J.V. Bertin <rjvbertin@gmail.com> | 2014-10-06 18:47:01 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-10-09 07:27:30 +0200 |
| commit | eb55d48d1035d06408ffe73696223464957aa71d (patch) | |
| tree | 300e350e1b484cc0bdf0b576bf11982b634cc80c /src/gui | |
| parent | 7d70583589aee971c7adf101edc8bb4b6f0066aa (diff) | |
| download | qt4-tools-eb55d48d1035d06408ffe73696223464957aa71d.tar.gz | |
[OS X]: respect icon visibility preference in system tray menus
Check the `IconVisibleInMenu` switch so that systray menu items only
show an icon if the application/user has configured things that way,
and not otherwise.
Task-number: QTBUG-41348
Change-Id: Ibb7db326fd598ca78cb95c815b5e165de2babeda
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/util/qsystemtrayicon_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/util/qsystemtrayicon_mac.mm b/src/gui/util/qsystemtrayicon_mac.mm index 07e3ea2aaf..bcb3e07b97 100644 --- a/src/gui/util/qsystemtrayicon_mac.mm +++ b/src/gui/util/qsystemtrayicon_mac.mm @@ -532,7 +532,7 @@ private: [item setState:action->isChecked() ? NSOnState : NSOffState]; [item setToolTip:(NSString*)QCFString::toCFStringRef(action->toolTip())]; const QIcon icon = action->icon(); - if(!icon.isNull()) { + if (!icon.isNull() && action->isIconVisibleInMenu()) { #ifndef QT_MAC_USE_COCOA const short scale = GetMBarHeight(); #else |