diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-09-04 14:06:31 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-09-04 14:07:45 +0200 |
| commit | bdfeb5dfa8d8c9dc178af05881d33c66d171391e (patch) | |
| tree | 36104229c75a22451c2713bb4e2c4087965670a3 | |
| parent | 0f34dac67b2b7c5312a3923e6ac6400dfe6790c8 (diff) | |
| parent | ee3a494f37d6a459a5d935446ba08d69ea310b9b (diff) | |
| download | bitcoin-bdfeb5dfa8d8c9dc178af05881d33c66d171391e.tar.xz | |
Merge #14133: gui: Favor macOS show / hide action in dock menu
ee3a494f37d6a459a5d935446ba08d69ea310b9b gui: Favor macOS show / hide action in dock menu (João Barbosa)
Pull request description:
Before:
<img width="188" alt="screen shot 2018-09-02 at 19 10 02" src="https://user-images.githubusercontent.com/3534524/44959393-5a44c400-aee5-11e8-90f4-9a30f67f7ee2.png">
After:
<img width="200" alt="screen shot 2018-09-02 at 19 19 01" src="https://user-images.githubusercontent.com/3534524/44959395-60d33b80-aee5-11e8-9773-1d04d3482115.png">
Note that macOS toggles between `Hide` and `Show`.
Tree-SHA512: e616fabc5a4689355d924cb99ce33c0d4c6618e858002cef7521dc4783346ff882341cf8d7f667d7fb920a8337373eff37169cddc2da93e48f7710e5c41d0b93
| -rw-r--r-- | src/qt/bitcoingui.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 5321cd94fd..86fdebdbef 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -614,8 +614,11 @@ void BitcoinGUI::createTrayIconMenu() #endif // Configuration of the tray icon (or dock icon) icon menu +#ifndef Q_OS_MAC + // Note: On Mac, the dock icon's menu already has show / hide action. trayIconMenu->addAction(toggleHideAction); trayIconMenu->addSeparator(); +#endif trayIconMenu->addAction(sendCoinsMenuAction); trayIconMenu->addAction(receiveCoinsMenuAction); trayIconMenu->addSeparator(); |