summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Dettman <dean.dettman@nokia.com>2009-08-13 11:02:35 (GMT)
committerDean Dettman <dean.dettman@nokia.com>2009-08-13 11:02:35 (GMT)
commit9ae362b3b3341bfa09cab6992496b8d4af409d06 (patch)
tree98feb1cd71587f536369428ac1170a919ec1fc40
parente5dfa0cdc5df3ebe75feb72cb937e4118da5459f (diff)
downloadQt-9ae362b3b3341bfa09cab6992496b8d4af409d06.zip
Qt-9ae362b3b3341bfa09cab6992496b8d4af409d06.tar.gz
Qt-9ae362b3b3341bfa09cab6992496b8d4af409d06.tar.bz2
Fix Menu icons are too large on Cocoa
The magic number 22 was based on windows sized icons, a size of 16 should be correct for mac Task-number: 259289 Reviewed-by: NRC
-rw-r--r--src/gui/widgets/qmenu_mac.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm
index bbfc6c8..ff5cfa5 100644
--- a/src/gui/widgets/qmenu_mac.mm
+++ b/src/gui/widgets/qmenu_mac.mm
@@ -1359,7 +1359,7 @@ QMenuPrivate::QMacMenuPrivate::syncAction(QMacMenuAction *action)
if (!action->action->icon().isNull()
&& action->action->isIconVisibleInMenu()) {
data.iconType = kMenuIconRefType;
- data.iconHandle = (Handle)qt_mac_create_iconref(action->action->icon().pixmap(22, QIcon::Normal));
+ data.iconHandle = (Handle)qt_mac_create_iconref(action->action->icon().pixmap(16, QIcon::Normal));
} else {
data.iconType = kMenuNoIcon;
}
@@ -1398,7 +1398,7 @@ QMenuPrivate::QMacMenuPrivate::syncAction(QMacMenuAction *action)
// Cocoa icon
NSImage *nsimage = 0;
if (!action->action->icon().isNull() && action->action->isIconVisibleInMenu()) {
- nsimage = static_cast<NSImage *>(qt_mac_create_nsimage(action->action->icon().pixmap(22, QIcon::Normal)));
+ nsimage = static_cast<NSImage *>(qt_mac_create_nsimage(action->action->icon().pixmap(16, QIcon::Normal)));
}
[item setImage:nsimage];
[nsimage release];