WIP fixing dialog position

ucam-department-of-psychiatry · May 17, 2024 · 1ec570c · 1ec570c
1 parent f5c24ac
commit 1ec570c
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 8 deletions.
diff --git a/tablet_qt/dialogs/passwordchangedialog.cpp b/tablet_qt/dialogs/passwordchangedialog.cpp
@@ -94,6 +94,7 @@ PasswordChangeDialog::PasswordChangeDialog(const QString& text,
     connect(buttonbox, &QDialogButtonBox::rejected,
             this, &PasswordChangeDialog::reject);
     mainlayout->addWidget(buttonbox);
+    mainlayout->addStretch(1);
 
     QScreen *screen = uifunc::screen();
 
@@ -161,27 +162,31 @@ void PasswordChangeDialog::centre()
 {
     sizeToScreen();
 
-    const int screen_width = uifunc::screenWidth();
-    const int screen_height = uifunc::screenHeight();
+    const int screen_width = uifunc::screenAvailableWidth();
+    const int screen_height = uifunc::screenAvailableHeight();
     const int old_height = height();
     const int old_width = width();
-    const int x = (screen_width - old_height) / 2;
-    const int y = (screen_height - old_width) / 2;
+    const int x = (screen_width - old_width) / 2;
+    const int y = (screen_height - old_height) / 2;
+    reportSize();
     qInfo() << QString("Moving to: %1, %2").arg(x).arg(y);
     move(x, y);
+    reportSize();
 }
 
 
 void PasswordChangeDialog::sizeToScreen()
 {
-    const int screen_width = uifunc::screenWidth();
-    const int screen_height = uifunc::screenHeight();
+    const int screen_width = uifunc::screenAvailableWidth();
+    const int screen_height = uifunc::screenAvailableHeight();
 
     bool changed = false;
 
     int new_width = width();
     int new_height = height();
 
+    reportSize();
+
     if (new_width > screen_width)
     {
         new_width = screen_width;
@@ -193,15 +198,19 @@ void PasswordChangeDialog::sizeToScreen()
         changed = true;
     }
     if (changed) {
+        qInfo() << QString("Resizing to: %1, %2").arg(new_width).arg(new_height);
         resize(new_width, new_height);
     }
+
+    reportSize();
+
 }
 
 
 void PasswordChangeDialog::reportSize()
 {
-    const int screen_width = uifunc::screenWidth();
-    const int screen_height = uifunc::screenHeight();
+    const int screen_width = uifunc::screenAvailableWidth();
+    const int screen_height = uifunc::screenAvailableHeight();
     const int old_height = height();
     const int old_width = width();
     QPoint old_pos = pos();

diff --git a/tablet_qt/lib/uifunc.cpp b/tablet_qt/lib/uifunc.cpp
@@ -713,6 +713,22 @@ QScreen* screen()
 }
 
 
+QRect screenAvailableGeometry()
+{
+    // https://stackoverflow.com/questions/18975734/how-can-i-find-the-screen-desktop-size-in-qt-so-i-can-display-a-desktop-notific
+    return screen()->availableGeometry();
+}
+
+int screenAvailableWidth()
+{
+    return screenAvailableGeometry().width();
+}
+
+int screenAvailableHeight()
+{
+    return screenAvailableGeometry().height();
+}
+
 QRect screenGeometry()
 {
     // https://stackoverflow.com/questions/18975734/how-can-i-find-the-screen-desktop-size-in-qt-so-i-can-display-a-desktop-notific
@@ -729,6 +745,7 @@ int screenHeight()
     return screenGeometry().height();
 }
 
+
 qreal screenDpi()
 {
     return screen()->logicalDotsPerInch();

diff --git a/tablet_qt/lib/uifunc.h b/tablet_qt/lib/uifunc.h
@@ -248,6 +248,9 @@ QSize minimumSizeForTitle(const QDialog* dialog,
                           bool include_app_name = false);
 
 QScreen* screen();
+QRect screenAvailableGeometry();
+int screenAvailableWidth();
+int screenAvailableHeight();
 QRect screenGeometry();
 int screenWidth();
 int screenHeight();