Merge #8481: Qt: Fix minimize and close bugs

laanwj · laanwj · commit 0d0abcac1efe · 2016-08-11T15:23:05.000+02:00
05242e9 Fix minimize and close bugs (adlawren)
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -902,17 +902,22 @@ void BitcoinGUI::closeEvent(QCloseEvent *event)
 #ifndef Q_OS_MAC // Ignored on Mac
     if(clientModel && clientModel->getOptionsModel())
     {
-        if(!clientModel->getOptionsModel()->getMinimizeToTray() &&
-           !clientModel->getOptionsModel()->getMinimizeOnClose())
+        if(!clientModel->getOptionsModel()->getMinimizeOnClose())
         {
             // close rpcConsole in case it was open to make some space for the shutdown window
             rpcConsole->close();
 
             QApplication::quit();
         }
+        else
+        {
+            QMainWindow::showMinimized();
+            event->ignore();
+        }
     }
-#endif
+#else
     QMainWindow::closeEvent(event);
+#endif
 }
 
 void BitcoinGUI::showEvent(QShowEvent *event)

Original file line number	Diff line number	Diff line change
`@@ -902,17 +902,22 @@ void BitcoinGUI::closeEvent(QCloseEvent *event)`
`902`	`902`	`#ifndef Q_OS_MAC // Ignored on Mac`
`903`	`903`	`if(clientModel && clientModel->getOptionsModel())`
`904`	`904`	`{`
`905`		`- if(!clientModel->getOptionsModel()->getMinimizeToTray() &&`
`906`		`- !clientModel->getOptionsModel()->getMinimizeOnClose())`
	`905`	`+ if(!clientModel->getOptionsModel()->getMinimizeOnClose())`
`907`	`906`	`{`
`908`	`907`	`// close rpcConsole in case it was open to make some space for the shutdown window`
`909`	`908`	`rpcConsole->close();`
`910`	`909`
`911`	`910`	`QApplication::quit();`
`912`	`911`	`}`
	`912`	`+ else`
	`913`	`+ {`
	`914`	`+ QMainWindow::showMinimized();`
	`915`	`+ event->ignore();`
	`916`	`+ }`
`913`	`917`	`}`
`914`		`-#endif`
	`918`	`+#else`
`915`	`919`	`QMainWindow::closeEvent(event);`
	`920`	`+#endif`
`916`	`921`	`}`
`917`	`922`
`918`	`923`	`void BitcoinGUI::showEvent(QShowEvent *event)`