Skip to content

Commit 4ac8ec1

Browse files
hebastoUdjinM6
authored andcommitted
qt, refactor: Replace BitcoinGUI::macosDockIconActivated with a lambda
1 parent 4ad371b commit 4ac8ec1

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

src/qt/bitcoingui.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -801,8 +801,10 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel, interfaces::BlockAndH
801801
// Note: on macOS, the Dock icon is also used to provide menu functionality
802802
// similar to one for tray icon
803803
MacDockIconHandler *dockIconHandler = MacDockIconHandler::instance();
804-
connect(dockIconHandler, &MacDockIconHandler::dockIconClicked, this, &BitcoinGUI::macosDockIconActivated);
805-
804+
connect(dockIconHandler, &MacDockIconHandler::dockIconClicked, [this] {
805+
showNormalIfMinimized();
806+
activateWindow();
807+
});
806808
dockIconMenu = new QMenu(this);
807809
dockIconMenu->setAsDockMenu();
808810

@@ -1075,12 +1077,6 @@ void BitcoinGUI::trayIconActivated(QSystemTrayIcon::ActivationReason reason)
10751077
toggleHidden();
10761078
}
10771079
}
1078-
#else
1079-
void BitcoinGUI::macosDockIconActivated()
1080-
{
1081-
showNormalIfMinimized();
1082-
activateWindow();
1083-
}
10841080
#endif
10851081

10861082
void BitcoinGUI::optionsClicked()

src/qt/bitcoingui.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,9 +374,6 @@ public Q_SLOTS:
374374
#ifndef Q_OS_MAC
375375
/** Handle tray icon clicked */
376376
void trayIconActivated(QSystemTrayIcon::ActivationReason reason);
377-
#else
378-
/** Handle macOS Dock icon clicked */
379-
void macosDockIconActivated();
380377
#endif
381378

382379
/** Show window if hidden, unminimize when minimized, rise when obscured or show if hidden and fToggleHidden is true */

0 commit comments

Comments
 (0)