From b53f6fdd313f71f05b99093966736a8f7442ded8 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Thu, 18 Sep 2014 20:49:41 +0200 Subject: Respect the PM_SmallIconSize setting for icons in a menu on OS X MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When a platform menu is used then it would hard code the icon size to 16x16. Instead of using the hard coded value then PM_SmallIconSize should be used instead. Change-Id: I27540ebc4397501e8f57686a118c28cd7167c0a1 Reviewed-by: Morten Johan Sørvig --- src/plugins/platforms/cocoa/qcocoamenuitem.mm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms/cocoa/qcocoamenuitem.mm') diff --git a/src/plugins/platforms/cocoa/qcocoamenuitem.mm b/src/plugins/platforms/cocoa/qcocoamenuitem.mm index 4b9a0146a9..d0d1e7e8b8 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuitem.mm +++ b/src/plugins/platforms/cocoa/qcocoamenuitem.mm @@ -100,7 +100,8 @@ QCocoaMenuItem::QCocoaMenuItem() : m_role(NoRole), m_checked(false), m_merged(false), - m_tag(0) + m_tag(0), + m_iconSize(16) { } @@ -332,7 +333,7 @@ NSMenuItem *QCocoaMenuItem::sync() NSImage *img = nil; if (!m_icon.isNull()) { img = qt_mac_create_nsimage(m_icon); - [img setSize:NSMakeSize(16, 16)]; + [img setSize:NSMakeSize(m_iconSize, m_iconSize)]; } [m_native setImage:img]; [img release]; @@ -403,3 +404,8 @@ QPlatformMenuItem::MenuRole QCocoaMenuItem::effectiveRole() const else return m_detectedRole; } + +void QCocoaMenuItem::setIconSize(int size) +{ + m_iconSize = size; +} -- cgit v1.2.3