1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix duplicated application menu items on Mac OS

Browse Source 
Added code to check to see if the menu item already exists in the
application menu before adding it.

Change-Id: Ie0a5eab3c61d5a3413a834d2e57bab40660f6802
Task-number: QTBUG-27202
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
This commit is contained in:
Chris Meyer 2012-10-12 10:46:25 -07:00 committed by The Qt Project
parent 865a5f0cda
commit d1f2309166
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,7 +195,7 @@ NSMenuItem *QCocoaMenuItem::sync()
QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *loader = getMenuLoader(); QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *loader = getMenuLoader();
switch (m_role) { switch (m_role) {
case ApplicationSpecificRole: case ApplicationSpecificRole:
mergeItem = [loader appSpecificMenuItem]; mergeItem = [loader appSpecificMenuItem:reinterpret_cast<NSInteger>(this)];
break; break;
case AboutRole: case AboutRole:
mergeItem = [loader aboutMenuItem]; mergeItem = [loader aboutMenuItem];

2
src/plugins/platforms/cocoa/qcocoamenuloader.h
View File

@ -79,7 +79,7 @@
- (NSMenuItem *)aboutMenuItem; - (NSMenuItem *)aboutMenuItem;
- (NSMenuItem *)aboutQtMenuItem; - (NSMenuItem *)aboutQtMenuItem;
- (NSMenuItem *)hideMenuItem; - (NSMenuItem *)hideMenuItem;
- (NSMenuItem *)appSpecificMenuItem; - (NSMenuItem *)appSpecificMenuItem:(NSInteger)tag;
- (IBAction)terminate:(id)sender; - (IBAction)terminate:(id)sender;
- (IBAction)orderFrontStandardAboutPanel:(id)sender; - (IBAction)orderFrontStandardAboutPanel:(id)sender;
- (IBAction)hideOtherApplications:(id)sender; - (IBAction)hideOtherApplications:(id)sender;

10
src/plugins/platforms/cocoa/qcocoamenuloader.mm
View File

@ -246,11 +246,17 @@ QT_END_NAMESPACE
return [[hideItem retain] autorelease]; return [[hideItem retain] autorelease];
} }
- (NSMenuItem *)appSpecificMenuItem - (NSMenuItem *)appSpecificMenuItem:(NSInteger)tag
{ {
NSMenuItem *item = [appMenu itemWithTag:tag];
// No reason to create the item if it already exists. See QTBUG-27202.
if (item)
return [[item retain] autorelease];
// Create an App-Specific menu item, insert it into the menu and return // Create an App-Specific menu item, insert it into the menu and return
// it as an autorelease item. // it as an autorelease item.
NSMenuItem *item = [[NSMenuItem alloc] init]; item = [[NSMenuItem alloc] init];
NSInteger location; NSInteger location;
if (lastAppSpecificItem == nil) { if (lastAppSpecificItem == nil) {