Changeset 79295 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 24, 2019 7:44:49 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6143. Adding code to save and load dialog geometry

Location:

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard

Files:

• UISoftKeyboard.cpp (modified) (4 diffs)
• UISoftKeyboard.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -38 +38 @@
 
 /* GUI includes: */
+#include "UIDesktopWidgetWatchdog.h"
 #include "QIDialogButtonBox.h"
 #include "QIFileDialog.h"
@@ -48 +49 @@
 #include "QIToolButton.h"
 #include "VBoxGlobal.h"
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils-darwin.h"
+#endif
 
 /* COM includes: */
@@ -2747 +2751 @@
 void UISoftKeyboard::saveSettings()
 {
+    /* Save window geometry to extradata: */
+    const QRect saveGeometry = geometry();
+#ifdef VBOX_WS_MAC
+    /* darwinIsWindowMaximized expects a non-const QWidget*. thus const_cast: */
+    QWidget *pw = const_cast<QWidget*>(qobject_cast<const QWidget*>(this));
+    gEDataManager->setSoftKeyboardDialogGeometry(saveGeometry, ::darwinIsWindowMaximized(pw));
+#else /* !VBOX_WS_MAC */
+    gEDataManager->setSoftKeyboardDialogGeometry(saveGeometry, isMaximized());
+#endif /* !VBOX_WS_MAC */
+    LogRel2(("GUI: Soft Keyboard: Geometry saved as: Origin=%dx%d, Size=%dx%d\n",
+             saveGeometry.x(), saveGeometry.y(), saveGeometry.width(), saveGeometry.height()));
 }
 
 void UISoftKeyboard::loadSettings()
 {
+    const QRect desktopRect = gpDesktop->availableGeometry(this);
+    int iDefaultWidth = desktopRect.width() / 2;
+    int iDefaultHeight = desktopRect.height() * 3 / 4;
+    QRect defaultGeometry(0, 0, iDefaultWidth, iDefaultHeight);
+
+    QWidget *pParentWidget = qobject_cast<QWidget*>(parent());
+    if (pParentWidget)
+        defaultGeometry.moveCenter(pParentWidget->geometry().center());
+
+    /* Load geometry from extradata: */
+    QRect geometry = gEDataManager->softKeyboardDialogGeometry(this, defaultGeometry);
+
+    /* Restore geometry: */
+    LogRel2(("GUI: Soft Keyboard: Restoring geometry to: Origin=%dx%d, Size=%dx%d\n",
+             geometry.x(), geometry.y(), geometry.width(), geometry.height()));
+    setDialogGeometry(geometry);
 }
 
@@ -2780 +2811 @@
 }
 
+void UISoftKeyboard::setDialogGeometry(const QRect &geometry)
+{
+#ifdef VBOX_WS_MAC
+    /* Use the old approach for OSX: */
+    move(geometry.topLeft());
+    resize(geometry.size());
+#else /* VBOX_WS_MAC */
+    /* Use the new approach for Windows/X11: */
+    VBoxGlobal::setTopLevelGeometry(this, geometry);
+#endif /* !VBOX_WS_MAC */
+
+    /* Maximize (if necessary): */
+    if (gEDataManager->softKeyboardDialogShouldBeMaximized())
+        showMaximized();
+}
+
+
 #include "UISoftKeyboard.moc"

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.h

@@ -92 +92 @@
     void updateStatusBarMessage(const QString &strLayoutName);
     void updateLayoutSelector();
+    void setDialogGeometry(const QRect &geometry);
     CKeyboard& keyboard() const;