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
This commit is contained in:
Wladimir J. van der Laan 2018-09-04 14:06:31 +02:00 committed by Munkybooty
parent e8934b9122
commit 3d28e1cfb2

View File

@ -885,8 +885,11 @@ void BitcoinGUI::createTrayIcon()
void BitcoinGUI::createIconMenu(QMenu *pmenu)
{
// Configuration of the tray icon (or dock icon) icon menu
pmenu->addAction(toggleHideAction);
pmenu->addSeparator();
#ifndef Q_OS_MAC
// Note: On Mac, the dock icon's menu already has show / hide action.
trayIconMenu->addAction(toggleHideAction);
trayIconMenu->addSeparator();
#endif
if (enableWallet) {
pmenu->addAction(sendCoinsMenuAction);
pmenu->addAction(coinJoinCoinsMenuAction);