Changeset 62929 in vbox for trunk/src/VBox

Timestamp:

Aug 3, 2016 3:55:42 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8505: X11: Selector UI: Do not save/restore normal/scaled geometry for the zero/fake screen case; Restore window geometry on available area changes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• UISelectorWindow.cpp (modified) (5 diffs)
• UISelectorWindow.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -29 +29 @@
 # if QT_VERSION >= 0x050000
 #  include <QStandardPaths>
+#  ifdef VBOX_WS_X11
+#   include <QDesktopWidget>
+#  endif /* VBOX_WS_X11 */
 # else /* QT_VERSION < 0x050000 */
 #  include <QDesktopServices>
@@ -135 +138 @@
 }
 
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+void UISelectorWindow::sltHandleHostScreenAvailableAreaChange()
+{
+    /* Prevent handling if fake screen detected: */
+    if (vboxGlobal().isFakeScreenDetected())
+        return;
+
+    /* Restore the geometry cached by the window: */
+    resize(m_geometry.size());
+    move(m_geometry.topLeft());
+}
+#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
+
 void UISelectorWindow::sltShowSelectorWindowContextMenu(const QPoint &position)
 {
@@ -1066 +1082 @@
         case QEvent::Resize:
         {
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+            /* Prevent handling if fake screen detected: */
+            if (vboxGlobal().isFakeScreenDetected())
+                break;
+#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
+
             if (isVisible() && (windowState() & (Qt::WindowMaximized | Qt::WindowMinimized | Qt::WindowFullScreen)) == 0)
             {
@@ -1075 +1097 @@
         case QEvent::Move:
         {
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+            /* Prevent handling if fake screen detected: */
+            if (vboxGlobal().isFakeScreenDetected())
+                break;
+#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
+
             if (isVisible() && (windowState() & (Qt::WindowMaximized | Qt::WindowMinimized | Qt::WindowFullScreen)) == 0)
             {
@@ -1695 +1723 @@
 void UISelectorWindow::prepareConnections()
 {
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+    /* Desktop event handlers: */
+    connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), this, SLOT(sltHandleHostScreenAvailableAreaChange()));
+#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
+
     /* Medium enumeration connections: */
     connect(&vboxGlobal(), SIGNAL(sigMediumEnumerationFinished()), this, SLOT(sltHandleMediumEnumerationFinish()));

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h

@@ -66 +66 @@
 
 private slots:
+
+#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+    /** Handles host-screen available-area change. */
+    void sltHandleHostScreenAvailableAreaChange();
+#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
 
     /** Handles selector-window context-menu call for passed @a position. */