From 2dc2d94b531ea2f5dca2236df8bbdc196ceedb69 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 9 May 2018 23:44:00 +0200
Subject: [PATCH] Ref T264, minor screen size adjustments

---
 src/blackgui/guiapplication.cpp      | 8 +++++---
 src/blackgui/guiutility.cpp          | 5 +++--
 src/blackgui/guiutility.h            | 4 ++--
 src/swiftguistandard/swiftguistd.cpp | 1 +
 src/swiftguistandard/swiftguistd.h   | 1 -
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/blackgui/guiapplication.cpp b/src/blackgui/guiapplication.cpp
index d1d9d31f6..320abdb72 100644
--- a/src/blackgui/guiapplication.cpp
+++ b/src/blackgui/guiapplication.cpp
@@ -285,6 +285,7 @@ namespace BlackGui
         const QSettings settings("swift-project.org", this->getApplicationName());
         const QByteArray g = settings.value("geometry").toByteArray();
         const QByteArray s = settings.value("windowState").toByteArray();
+        if (g.isEmpty() || s.isEmpty()) { return false; }
         window->restoreGeometry(g);
         window->restoreState(s);
         return true;
@@ -301,13 +302,14 @@ namespace BlackGui
         // window size
         if (m_minWidthChars > 0 || m_minHeightChars > 0)
         {
-            const QSizeF s = CGuiUtility::fontMetricsEstimateSize(m_minWidthChars, m_minHeightChars);
+            const QSizeF fontMetricEstSize = CGuiUtility::fontMetricsEstimateSize(m_minWidthChars, m_minHeightChars);
             QWidget *mw = CGuiUtility::mainApplicationWidget();
             if (mw)
             {
+                // setMinimumSizeInCharacters sets m_minHeightChars/m_minWidthChars
                 QSize cs = mw->size();
-                if (m_minWidthChars > 0)  { cs.setWidth(s.width()); }
-                if (m_minHeightChars > 0) { cs.setHeight(s.height()); }
+                if (m_minWidthChars > 0)  { cs.setWidth(fontMetricEstSize.width()); }
+                if (m_minHeightChars > 0) { cs.setHeight(fontMetricEstSize.height()); }
                 mw->resize(cs);
             }
         }
diff --git a/src/blackgui/guiutility.cpp b/src/blackgui/guiutility.cpp
index cae0b0b7c..a30b95153 100644
--- a/src/blackgui/guiutility.cpp
+++ b/src/blackgui/guiutility.cpp
@@ -103,7 +103,7 @@ namespace BlackGui
         if (mw) { return QApplication::desktop()->screenGeometry(mw).size(); }
 
         // main screen
-        return QApplication::desktop()->screenGeometry().size();
+        return QApplication::desktop()->screenGeometry(QApplication::desktop()).size();
     }
 
     bool CGuiUtility::isMainWindowFrameless()
@@ -486,7 +486,8 @@ namespace BlackGui
         const QWidget *mainWidget = CGuiUtility::mainApplicationWidget();
         if (mainWidget)
         {
-            QSize sd = QApplication::desktop()->screenGeometry().size();
+            // const QSize sd = QApplication::desktop()->screenGeometry().size();
+            const QSize sd = QApplication::desktop()->screenGeometry(mainWidget).size();
             desktop = QString("Desktop w%1 w%2").arg(sd.width()).arg(sd.height());
             ratio = QString("ratio: %1").arg(mainWidget->devicePixelRatioF());
         }
diff --git a/src/blackgui/guiutility.h b/src/blackgui/guiutility.h
index da40ca515..7ea258550 100644
--- a/src/blackgui/guiutility.h
+++ b/src/blackgui/guiutility.h
@@ -56,7 +56,7 @@ namespace BlackGui
         static qreal mainApplicationWidgetPixelRatio();
 
         //! Desktop size
-        //! might be scaled depending on mainApplicationWidgetPixelRatio
+        //! \remark might be scaled depending on CGuiUtility::mainApplicationWidgetPixelRatio
         static QSize desktopSize();
 
         //! Is main window frameless?
@@ -174,7 +174,7 @@ namespace BlackGui
         static void superviseMainWindowMinSizes(qreal wRatio = 0.85, qreal hRatio = 0.85);
 
     private:
-        //! Constructor, use static methods only
+        //! No constructor, use static functions only
         CGuiUtility() {}
 
         static QWidget *s_mainApplicationWidget;
diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp
index 1d8efd903..b9b9f6bfc 100644
--- a/src/swiftguistandard/swiftguistd.cpp
+++ b/src/swiftguistandard/swiftguistd.cpp
@@ -34,6 +34,7 @@
 #include <QAction>
 #include <QDateTime>
 #include <QIcon>
+#include <QSize>
 #include <QStackedWidget>
 #include <QStyle>
 #include <QWidget>
diff --git a/src/swiftguistandard/swiftguistd.h b/src/swiftguistandard/swiftguistd.h
index a805d45a9..588b6c54c 100644
--- a/src/swiftguistandard/swiftguistd.h
+++ b/src/swiftguistandard/swiftguistd.h
@@ -33,7 +33,6 @@
 #include <QMainWindow>
 #include <QObject>
 #include <QScopedPointer>
-#include <QSize>
 #include <QString>
 
 class QAction;