LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge pull request #2530 from jonasschnelli/mac_win_reopen_fix

Browse source 
fixes #1522: GUI Disappearing (Mac OSX)
This commit is contained in:
Wladimir J. van der Laan 2013-04-27 02:15:54 -07:00
commit 63888d43be
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/qt/bitcoingui.cpp
View file

@ -153,6 +153,7 @@ BitcoinGUI::~BitcoinGUI()
trayIcon->hide(); trayIcon->hide();
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
delete appMenuBar; delete appMenuBar;
MacDockIconHandler::instance()->setMainWindow(NULL);
#endif #endif
} }
@ -380,6 +381,7 @@ void BitcoinGUI::createTrayIconMenu()
#else #else
// Note: On Mac, the dock icon is used to provide the tray's functionality. // Note: On Mac, the dock icon is used to provide the tray's functionality.
MacDockIconHandler *dockIconHandler = MacDockIconHandler::instance(); MacDockIconHandler *dockIconHandler = MacDockIconHandler::instance();
dockIconHandler->setMainWindow((QMainWindow *)this);
trayIconMenu = dockIconHandler->dockMenu(); trayIconMenu = dockIconHandler->dockMenu();
#endif #endif

4
src/qt/macdockiconhandler.h
View file

@ -2,6 +2,7 @@
#define MACDOCKICONHANDLER_H #define MACDOCKICONHANDLER_H
#include <QObject> #include <QObject>
#include <QMainWindow>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QMenu; class QMenu;
@ -26,7 +27,7 @@ public:
QMenu *dockMenu(); QMenu *dockMenu();
void setIcon(const QIcon &icon); void setIcon(const QIcon &icon);
void setMainWindow(QMainWindow *window);
static MacDockIconHandler *instance(); static MacDockIconHandler *instance();
void handleDockIconClickEvent(); void handleDockIconClickEvent();
@ -40,6 +41,7 @@ private:
DockIconClickEventHandler *m_dockIconClickEventHandler; DockIconClickEventHandler *m_dockIconClickEventHandler;
QWidget *m_dummyWidget; QWidget *m_dummyWidget;
QMenu *m_dockMenu; QMenu *m_dockMenu;
QMainWindow *mainWindow;
}; };
#endif // MACDOCKICONCLICKHANDLER_H #endif // MACDOCKICONCLICKHANDLER_H

11
src/qt/macdockiconhandler.mm
View file

@ -37,8 +37,9 @@ extern void qt_mac_set_dock_menu(QMenu*);
Q_UNUSED(event) Q_UNUSED(event)
Q_UNUSED(replyEvent) Q_UNUSED(replyEvent)
if (dockIconHandler) if (dockIconHandler) {
dockIconHandler->handleDockIconClickEvent(); dockIconHandler->handleDockIconClickEvent();
}
} }
@end @end
@ -54,10 +55,15 @@ MacDockIconHandler::MacDockIconHandler() : QObject()
[pool release]; [pool release];
} }
void MacDockIconHandler::setMainWindow(QMainWindow *window) {
this->mainWindow = window;
}
MacDockIconHandler::~MacDockIconHandler() MacDockIconHandler::~MacDockIconHandler()
{ {
[this->m_dockIconClickEventHandler release]; [this->m_dockIconClickEventHandler release];
delete this->m_dummyWidget; delete this->m_dummyWidget;
this->setMainWindow(NULL);
} }
QMenu *MacDockIconHandler::dockMenu() QMenu *MacDockIconHandler::dockMenu()
@ -94,5 +100,8 @@ MacDockIconHandler *MacDockIconHandler::instance()
void MacDockIconHandler::handleDockIconClickEvent() void MacDockIconHandler::handleDockIconClickEvent()
{ {
this->mainWindow->activateWindow();
this->mainWindow->show();
emit this->dockIconClicked(); emit this->dockIconClicked();
} }