Various fixes for mac with new UI

Author: Nico-Duduf

src/main.cpp

@@ -7,7 +7,7 @@
 #ifdef Q_OS_WIN
 #include "FramelessWindow/QWinWidget.h"
 #else
-#include "UI/mainwindow.h"
+#include "mainwindow.h"
 #endif
 
 #ifdef __APPLE__
@@ -20,6 +20,13 @@
 
 int main(int argc, char *argv[])
 {
+    //This has the app draw at HiDPI scaling on HiDPI displays, usually two pixels for every one logical pixel
+    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+
+    //This has QPixmap images use the @2x images when available
+    //See this bug for more details on how to get this right: https://bugreports.qt.io/browse/QTBUG-44486#comment-327410
+    QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+
     DuApplication a(argc, argv);
 
     // process CLI arguments
@@ -107,13 +114,12 @@ int main(int argc, char *argv[])
 
 #else
     //On OS X / Linux, the widget can handle everything itself so just create Widget as normal
-    MainWindow *w = new MainWindow( args );
+    MainWindow *w = new MainWindow( a.arguments() );
 
     // Restore Geometry and state
     w->restoreGeometry( DuSettingsManager::instance()->uiWindowGeometry() );
     w->restoreState(DuSettingsManager::instance()->uiWindowState());
-    // But hide the docks for a cleaner look
-    w->hideAllDocks();
+
 #endif
 
     w->show();

src/mainwindow.cpp

@@ -698,6 +698,7 @@ void MainWindow::duqf_initUi()
     {
         DuMenu *trayMenu = new DuMenu(QString(STR_INTERNALNAME),this);
         QSettings settings;
+
 #ifdef Q_OS_LINUX
         QString trayIconType = settings.value("appearance/trayIconType", "light").toString();
 #else
@@ -732,7 +733,7 @@ void MainWindow::duqf_initUi()
     //drag window
     duqf_toolBarClicked = false;
 
-#ifdef Q_OS_LINUX
+#ifndef Q_OS_WIN
     mainToolBar->installEventFilter(this);
 #endif
 
@@ -764,7 +765,6 @@ void MainWindow::duqf_initUi()
     minWidget->setObjectName("windowButton");
     mainToolBar->layout()->setAlignment(minWidget, Qt::AlignTop);
 
-#ifndef Q_OS_MAC
     m_maximizeAction = new QAction(this);
     QIcon maximizeIcon;
     maximizeIcon.addFile(":/icons/maximize", QSize(), QIcon::Normal, QIcon::Off);
@@ -776,7 +776,6 @@ void MainWindow::duqf_initUi()
     maxWidget->setFixedSize(24,24);
     maxWidget->setObjectName("windowButton");
     mainToolBar->layout()->setAlignment(maxWidget, Qt::AlignTop);
-#endif // NOT MAC
 
     m_closeAction = new QAction(this);
     m_closeAction->setIcon(QIcon(":/icons/close-simple"));
@@ -786,7 +785,7 @@ void MainWindow::duqf_initUi()
     closeWidget->setObjectName("windowButton");
     mainToolBar->layout()->setAlignment(closeWidget, Qt::AlignTop);
 
-#endif // Not LINUX
+#endif // Not linux
 
     // ===== STATUSBAR ======
 
@@ -893,14 +892,19 @@ void MainWindow::duqf_initUi()
     DuApplication *app = qobject_cast<DuApplication*>(qApp);
     duqf_updateAvailable(app->updateInfo());
 
-#ifndef Q_OS_LINUX
+#ifdef Q_OS_WIN
     connect(m_minimizeAction, &QAction::triggered, this, &MainWindow::minimizeTriggered);
-#ifndef Q_OS_MAC
     connect(m_maximizeAction, &QAction::triggered, this, &MainWindow::maximizeTriggered);
-#endif // Not mac
     connect(m_closeAction, &QAction::triggered, this, &MainWindow::close);
+#endif
+
+#ifdef Q_OS_MAC
+    connect(m_minimizeAction, &QAction::triggered, this, &QMainWindow::showMinimized);
+    connect(m_maximizeAction, &QAction::triggered, this, &MainWindow::maximize);
+    connect(m_closeAction, &QAction::triggered, this, &MainWindow::close);
+#endif
+
     connect(qApp, &QCoreApplication::aboutToQuit, this, &MainWindow::onQuit);
-#endif // Not linux
 }
 
 void MainWindow::duqf_setStyle()
@@ -1063,6 +1067,12 @@ void MainWindow::duqf_updateAvailable(QJsonObject updateInfo)
     }
 }
 
+void MainWindow::maximize(bool m)
+{
+    if (m) showMaximized();
+    else showNormal();
+}
+
 void MainWindow::log(DuQFLog m)
 {
     QString message = m.message();

src/mainwindow.h

@@ -193,6 +193,7 @@ private slots:
     void duqf_showHide();
     void duqf_askBeforeClose();
     void duqf_updateAvailable(QJsonObject updateInfo);
+    void maximize(bool m);
 
     void log(DuQFLog m);