qt, refactor: Replace BitcoinGUI::macosDockIconActivated with a lambda
This commit is contained in:
2 files changed
+4
-10
No files matched your search
@@ -793,7 +793,10 @@ void BitcoinGUI::createTrayIconMenu()
|
|||||||
#else
|
#else
|
||||||
// Note: On macOS, the Dock icon is used to provide the tray's functionality.
|
// Note: On macOS, the Dock icon is used to provide the tray's functionality.
|
||||||
MacDockIconHandler *dockIconHandler = MacDockIconHandler::instance();
|
MacDockIconHandler *dockIconHandler = MacDockIconHandler::instance();
|
||||||
connect(dockIconHandler, &MacDockIconHandler::dockIconClicked, this, &BitcoinGUI::macosDockIconActivated);
|
connect(dockIconHandler, &MacDockIconHandler::dockIconClicked, [this] {
|
||||||
|
show();
|
||||||
|
activateWindow();
|
||||||
|
});
|
||||||
trayIconMenu->setAsDockMenu();
|
trayIconMenu->setAsDockMenu();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -828,12 +831,6 @@ void BitcoinGUI::trayIconActivated(QSystemTrayIcon::ActivationReason reason)
|
|||||||
toggleHidden();
|
toggleHidden();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
void BitcoinGUI::macosDockIconActivated()
|
|
||||||
{
|
|
||||||
show();
|
|
||||||
activateWindow();
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void BitcoinGUI::optionsClicked()
|
void BitcoinGUI::optionsClicked()
|
||||||
|
|||||||
@@ -305,9 +305,6 @@ public Q_SLOTS:
|
|||||||
#ifndef Q_OS_MAC
|
#ifndef Q_OS_MAC
|
||||||
/** Handle tray icon clicked */
|
/** Handle tray icon clicked */
|
||||||
void trayIconActivated(QSystemTrayIcon::ActivationReason reason);
|
void trayIconActivated(QSystemTrayIcon::ActivationReason reason);
|
||||||
#else
|
|
||||||
/** Handle macOS Dock icon clicked */
|
|
||||||
void macosDockIconActivated();
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/** Show window if hidden, unminimize when minimized, rise when obscured or show if hidden and fToggleHidden is true */
|
/** Show window if hidden, unminimize when minimized, rise when obscured or show if hidden and fToggleHidden is true */
|
||||||
|
|||||||
Reference in new issue
Block a user