儲存庫 vbox 的更動 63230

時間撮記:

2016-8-9 下午05:18:44 (8 年 以前)

作者:

vboxsync

訊息:

FE/Qt: bugref:7625: Runtime UI: Normalization for Scaled mode as well, useful for pushing windows to visible area (same as for Normal mode but without touching a size).

位置:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale

檔案:

• UIMachineWindowScale.cpp (修改) (2 筆差異)
• UIMachineWindowScale.h (修改) (1 筆差異)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp

@@ -123 +123 @@
             setGeometry(m_normalGeometry);
         }
+
+        /* Normalize to the optimal size: */
+#ifdef VBOX_WS_X11
+        QTimer::singleShot(0, this, SLOT(sltNormalizeGeometry()));
+#else /* !VBOX_WS_X11 */
+        normalizeGeometry(true /* adjust position */);
+#endif /* !VBOX_WS_X11 */
     }
 }
@@ -173 +180 @@
     /* Adjust machine-view accordingly: */
     adjustMachineViewSize();
+}
+
+void UIMachineWindowScale::normalizeGeometry(bool fAdjustPosition)
+{
+#ifndef VBOX_GUI_WITH_CUSTOMIZATIONS1
+    /* Skip if maximized: */
+    if (isMaximized())
+        return;
+
+    /* Calculate client window offsets: */
+    QRect frGeo = frameGeometry();
+    const QRect geo = geometry();
+    const int dl = geo.left() - frGeo.left();
+    const int dt = geo.top() - frGeo.top();
+    const int dr = frGeo.right() - geo.right();
+    const int db = frGeo.bottom() - geo.bottom();
+
+    /* Adjust position if necessary: */
+    if (fAdjustPosition)
+        frGeo = VBoxGlobal::normalizeGeometry(frGeo, gpDesktop->overallAvailableRegion());
+
+    /* Finally, set the frame geometry: */
+    setGeometry(frGeo.left() + dl, frGeo.top() + dt,
+                frGeo.width() - dl - dr, frGeo.height() - dt - db);
+#else /* VBOX_GUI_WITH_CUSTOMIZATIONS1 */
+    /* Customer request: There should no be
+     * machine-window resize/move on machine-view resize: */
+    Q_UNUSED(fAdjustPosition);
+#endif /* VBOX_GUI_WITH_CUSTOMIZATIONS1 */
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.h

@@ -57 +57 @@
     virtual void restoreCachedGeometry() /* override */;
 
+    /** Performs window geometry normalization according to guest-size and host's available geometry.
+      * @param  fAdjustPosition  Determines whether is it necessary to adjust position as well. */
+    virtual void normalizeGeometry(bool fAdjustPosition) /* override */;
+
     /** Common @a pEvent handler. */
     bool event(QEvent *pEvent);