sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 13:03:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[QT] fix OSX dock icon window reopening

Browse Source 
fixes #5878

Rebased-From: 89e70e931d
Github-Pull: #5880
This commit is contained in:
Jonas Schnelli 2015-03-12 00:08:22 +01:00 committed by Wladimir J. van der Laan
parent 11173786ce
commit 81145a6ccd
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/qt/macdockiconhandler.mm
View File

@ -11,52 +11,46 @@
#undef slots #undef slots
#include <Cocoa/Cocoa.h> #include <Cocoa/Cocoa.h>
#include <objc/objc.h>
#include <objc/message.h>
#if QT_VERSION < 0x050000 #if QT_VERSION < 0x050000
extern void qt_mac_set_dock_menu(QMenu *); extern void qt_mac_set_dock_menu(QMenu *);
#endif #endif
@interface DockIconClickEventHandler : NSObject static MacDockIconHandler *s_instance = NULL;
{
MacDockIconHandler* dockIconHandler; bool dockClickHandler(id self,SEL _cmd,...) {
Q_UNUSED(self)
Q_UNUSED(_cmd)
s_instance->handleDockIconClickEvent();
// Return NO (false) to suppress the default OS X actions
return false;
} }
@end void setupDockClickHandler() {
Class cls = objc_getClass("NSApplication");
@implementation DockIconClickEventHandler id appInst = objc_msgSend((id)cls, sel_registerName("sharedApplication"));
- (id)initWithDockIconHandler:(MacDockIconHandler *)aDockIconHandler if (appInst != NULL) {
{ id delegate = objc_msgSend(appInst, sel_registerName("delegate"));
self = [super init]; Class delClass = (Class)objc_msgSend(delegate, sel_registerName("class"));
if (self) { SEL shouldHandle = sel_registerName("applicationShouldHandleReopen:hasVisibleWindows:");
dockIconHandler = aDockIconHandler; if (class_getInstanceMethod(delClass, shouldHandle))
class_replaceMethod(delClass, shouldHandle, (IMP)dockClickHandler, "B@:");
[[NSAppleEventManager sharedAppleEventManager] else
setEventHandler:self class_addMethod(delClass, shouldHandle, (IMP)dockClickHandler,"B@:");
andSelector:@selector(handleDockClickEvent:withReplyEvent:)
forEventClass:kCoreEventClass
andEventID:kAEReopenApplication];
}
return self;
}
- (void)handleDockClickEvent:(NSAppleEventDescriptor*)event withReplyEvent:(NSAppleEventDescriptor*)replyEvent
{
Q_UNUSED(event)
Q_UNUSED(replyEvent)
if (dockIconHandler) {
dockIconHandler->handleDockIconClickEvent();
} }
} }
@end
MacDockIconHandler::MacDockIconHandler() : QObject() MacDockIconHandler::MacDockIconHandler() : QObject()
{ {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
this->m_dockIconClickEventHandler = [[DockIconClickEventHandler alloc] initWithDockIconHandler:this]; setupDockClickHandler();
this->m_dummyWidget = new QWidget(); this->m_dummyWidget = new QWidget();
this->m_dockMenu = new QMenu(this->m_dummyWidget); this->m_dockMenu = new QMenu(this->m_dummyWidget);
this->setMainWindow(NULL); this->setMainWindow(NULL);
@ -119,7 +113,6 @@ void MacDockIconHandler::setIcon(const QIcon &icon)
MacDockIconHandler *MacDockIconHandler::instance() MacDockIconHandler *MacDockIconHandler::instance()
{ {
static MacDockIconHandler *s_instance = NULL;
if (!s_instance) if (!s_instance)
s_instance = new MacDockIconHandler(); s_instance = new MacDockIconHandler();
return s_instance; return s_instance;