Changeset 49177 in vbox

Timestamp:

Oct 18, 2013 11:48:13 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Guest screen size adjustment mechanism.

Location:

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

Files:

• UIMachineLogic.cpp (modified) (2 diffs)
• UIMachineLogic.h (modified) (1 diff)
• UIMachineView.cpp (modified) (1 diff)
• UIMachineView.h (modified) (1 diff)
• UIMachineWindow.h (modified) (1 diff)
• UISession.cpp (modified) (2 diffs)
• UISession.h (modified) (1 diff)
• fullscreen/UIMachineViewFullscreen.cpp (modified) (2 diffs)
• fullscreen/UIMachineViewFullscreen.h (modified) (1 diff)
• fullscreen/UIMachineWindowFullscreen.cpp (modified) (1 diff)
• normal/UIMachineViewNormal.cpp (modified) (3 diffs)
• normal/UIMachineViewNormal.h (modified) (2 diffs)
• normal/UIMachineWindowNormal.cpp (modified) (4 diffs)
• normal/UIMachineWindowNormal.h (modified) (2 diffs)
• scale/UIMachineViewScale.h (modified) (1 diff)
• seamless/UIMachineViewSeamless.cpp (modified) (2 diffs)
• seamless/UIMachineViewSeamless.h (modified) (1 diff)
• seamless/UIMachineWindowSeamless.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -271 +271 @@
 }
 
+/** Adjusts guest screen size for each the machine-window we have. */
+void UIMachineLogic::maybeAdjustGuestScreenSize()
+{
+    foreach(UIMachineWindow *pMachineWindow, machineWindows())
+        pMachineWindow->machineView()->maybeAdjustGuestScreenSize();
+}
+
 #ifdef Q_WS_MAC
 void UIMachineLogic::updateDockIcon()
@@ -1120 +1127 @@
             pMachineWindow->showNormal();
 
-        /* Normalize view's geometry: */
-        pMachineWindow->machineView()->normalizeGeometry(true);
+        /* Normalize window geometry: */
+        pMachineWindow->normalizeGeometry(true);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -79 +79 @@
     bool isPreventAutoClose() const { return m_fIsPreventAutoClose; }
     void setPreventAutoClose(bool fIsPreventAutoClose) { m_fIsPreventAutoClose = fIsPreventAutoClose; }
+
+    /* API: Guest screen size stuff: */
+    void maybeAdjustGuestScreenSize();
 
     /* Wrapper to open Machine settings / Network page: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -275 +275 @@
             /* Normalize machine-window geometry: */
             if (visualStateType() == UIVisualStateType_Normal)
-                normalizeGeometry(true /* Adjust Position? */);
+                machineWindow()->normalizeGeometry(true /* adjust position */);
         }
     }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h

@@ -76 +76 @@
     virtual void setGuestAutoresizeEnabled(bool /* fEnabled */) {}
 
-    /* Public members: */
-    virtual void normalizeGeometry(bool /* bAdjustPosition = false */) = 0;
+    /** Adjusts guest screen size to correspond current machine-window size.
+      * @note Reimplemented in sub-classes. Base implementation does nothing. */
+    virtual void maybeAdjustGuestScreenSize() {}
 
     /* Framebuffer aspect ratio: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.h

@@ -61 +61 @@
     CSession& session() const;
     CMachine machine() const;
+
+    /** Adjusts machine-window size to correspond current guest screen size.
+      * @param fAdjustPosition determines whether is it necessary to adjust position too.
+      * @note  Reimplemented in sub-classes. Base implementation does nothing. */
+    virtual void normalizeGeometry(bool fAdjustPosition) { Q_UNUSED(fAdjustPosition); }
 
 #ifndef VBOX_WITH_TRANSLUCENT_SEAMLESS

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -206 +206 @@
 }
 
-void UISession::adjustGuestView()
-{
-    foreach(UIMachineWindow *pMachineWindow, machineLogic()->machineWindows())
-    {
-        bool fAdjustPosition = false;
-        UIVisualStateType visualStateType = machineLogic()->visualStateType();
-
-        if (visualStateType == UIVisualStateType_Normal ||
-            visualStateType == UIVisualStateType_Scale)
-            fAdjustPosition = true;
-
-        /* Normalize view's geometry: */
-        pMachineWindow->machineView()->normalizeGeometry(fAdjustPosition);
-    }
-}
-
 void UISession::powerUp()
 {
@@ -276 +260 @@
     {
         msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_state_restore_90px.png", 0, 0);
-        /* If restoring from saved state, guest MachineView
-           should be notified about host MachineWindow geometry change */
-        adjustGuestView();
+        /* After restoring from 'saved' state, guest screen size should be adjusted: */
+        machineLogic()->maybeAdjustGuestScreenSize();
     }
     else

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -271 +271 @@
     void reinitMenuPool();
     bool preparePowerUp();
-    void adjustGuestView();
     int countOfVisibleWindows();
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp

@@ -63 +63 @@
 void UIMachineViewFullscreen::sltAdditionsStateChanged()
 {
-    normalizeGeometry(false);
+    maybeAdjustGuestScreenSize();
 }
 
@@ -136 +136 @@
 }
 
-void UIMachineViewFullscreen::normalizeGeometry(bool /* fAdjustPosition */)
+/** Adjusts guest screen size to correspond current <i>working area</i> size. */
+void UIMachineViewFullscreen::maybeAdjustGuestScreenSize()
 {
     /* Check if we should adjust guest to new size: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.h

@@ -62 +62 @@
     void setGuestAutoresizeEnabled(bool bEnabled);
 
-    /* Private helpers: */
-    void normalizeGeometry(bool fAdjustPosition);
+    /* Helpers: Geometry stuff: */
+    void maybeAdjustGuestScreenSize();
     QRect workingArea() const;
     QSize calculateMaxGuestSize() const;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -165 +165 @@
     /* Resize to the appropriate size: */
     resize(workingArea.size());
-    /* Adjust guest if necessary: */
-    machineView()->normalizeGeometry(false);
+    /* Adjust guest screen size if necessary: */
+    machineView()->maybeAdjustGuestScreenSize();
     /* Move mini-toolbar into appropriate place: */
     if (m_pMiniToolBar)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp

@@ -49 +49 @@
     , m_bIsGuestAutoresizeEnabled(gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize)->isChecked())
 {
-
-    /* Initialization: */
-    sltAdditionsStateChanged();
+    /* Resend the last resize hint if there was a fullscreen or
+     * seamless transition previously. If we were not in graphical
+     * mode initially after the transition this happens when we switch. */
+    maybeResendResizeHint();
 }
 
@@ -65 +66 @@
 void UIMachineViewNormal::sltAdditionsStateChanged()
 {
-    /* Resend the last resize hint if there was a fullscreen or
-     * seamless transition previously.  If we were not in graphical
-     * mode initially after the transition this happens when we
-     * switch. */
-    maybeResendResizeHint();
+    maybeAdjustGuestScreenSize();
 }
 
@@ -194 +191 @@
 }
 
-void UIMachineViewNormal::normalizeGeometry(bool bAdjustPosition)
-{
-#ifndef VBOX_GUI_WITH_CUSTOMIZATIONS1
-    QWidget *pTopLevelWidget = window();
-
-    /* Calculate client window offsets: */
-    QRect frameGeo = pTopLevelWidget->frameGeometry();
-    QRect geo = pTopLevelWidget->geometry();
-    int dl = geo.left() - frameGeo.left();
-    int dt = geo.top() - frameGeo.top();
-    int dr = frameGeo.right() - geo.right();
-    int db = frameGeo.bottom() - geo.bottom();
-
-    /* Get the best size w/o scroll bars: */
-    QSize s = pTopLevelWidget->sizeHint();
-
-    /* Resize the frame to fit the contents: */
-    s -= pTopLevelWidget->size();
-    frameGeo.setRight(frameGeo.right() + s.width());
-    frameGeo.setBottom(frameGeo.bottom() + s.height());
-
-    if (bAdjustPosition)
-    {
-        QRegion availableGeo;
-        QDesktopWidget *dwt = QApplication::desktop();
-        if (dwt->isVirtualDesktop())
-            /* Compose complex available region */
-            for (int i = 0; i < dwt->numScreens(); ++ i)
-                availableGeo += dwt->availableGeometry(i);
-        else
-            /* Get just a simple available rectangle */
-            availableGeo = dwt->availableGeometry(pTopLevelWidget->pos());
-
-        frameGeo = VBoxGlobal::normalizeGeometry(frameGeo, availableGeo);
-    }
-
-#if 0
-    /* Center the frame on the desktop: */
-    frameGeo.moveCenter(availableGeo.center());
-#endif
-
-    /* Finally, set the frame geometry */
-    pTopLevelWidget->setGeometry(frameGeo.left() + dl, frameGeo.top() + dt, frameGeo.width() - dl - dr, frameGeo.height() - dt - db);
-
-#else /* !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
-    Q_UNUSED(bAdjustPosition);
-#endif /* VBOX_GUI_WITH_CUSTOMIZATIONS1 */
+/** Adjusts guest screen size to correspond current machine-window size. */
+void UIMachineViewNormal::maybeAdjustGuestScreenSize()
+{
+    /* Check if we should adjust guest to new size: */
+    QSize centralWidgetSize = machineWindow()->centralWidget()->size();
+    if ((int)frameBuffer()->width() != centralWidgetSize.width() ||
+        (int)frameBuffer()->height() != centralWidgetSize.height())
+        if (m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
+            sltPerformGuestResize(centralWidgetSize);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.h

@@ -44 +44 @@
     void sltAdditionsStateChanged();
 
-#ifdef Q_WS_X11
-    /* Slot to perform synchronized geometry normalization.
-     * Currently its only required under X11 as of its async nature: */
-    virtual void sltNormalizeGeometry() { normalizeGeometry(true); }
-#endif /* Q_WS_X11 */
-
 private:
 
@@ -72 +66 @@
     /* Private helpers: */
     void maybeResendResizeHint();
-    void normalizeGeometry(bool fAdjustPosition);
+    void maybeAdjustGuestScreenSize();
     QRect workingArea() const;
     QSize calculateMaxGuestSize() const;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -457 +457 @@
                 m_normalGeometry = QRect(x, y, width(), height());
                 setGeometry(m_normalGeometry);
-                if (machineView())
-                    machineView()->normalizeGeometry(false);
+                /* Normalize to the optimal size: */
+                normalizeGeometry(false);
             }
             /* Maximize if needed: */
@@ -466 +466 @@
         else
         {
-            /* Normalize view early to the optimal size: */
-            if (machineView())
-                machineView()->normalizeGeometry(true);
+            /* Normalize to the optimal size: */
+            normalizeGeometry(true);
             /* Move newly created window to the screen center: */
             m_normalGeometry = geometry();
@@ -475 +474 @@
         }
 
-        /* Normalize view to the optimal size: */
-        if (machineView())
+        /* Normalize to the optimal size: */
 #ifdef Q_WS_X11
-            QTimer::singleShot(0, machineView(), SLOT(sltNormalizeGeometry()));
-#else /* Q_WS_X11 */
-            machineView()->normalizeGeometry(true);
-#endif
+        QTimer::singleShot(0, this, SLOT(sltNormalizeGeometry()));
+#else /* !Q_WS_X11 */
+        normalizeGeometry(true);
+#endif /* !Q_WS_X11 */
     }
 
@@ -611 +609 @@
 }
 
+/**
+ * Adjusts machine-window size to correspond current guest screen size.
+ * @param fAdjustPosition determines whether is it necessary to adjust position too.
+ */
+void UIMachineWindowNormal::normalizeGeometry(bool fAdjustPosition)
+{
+#ifndef VBOX_GUI_WITH_CUSTOMIZATIONS1
+    /* Skip if maximized: */
+    if (isMaximized())
+        return;
+
+    /* Calculate client window offsets: */
+    QRect frameGeo = frameGeometry();
+    QRect geo = geometry();
+    int dl = geo.left() - frameGeo.left();
+    int dt = geo.top() - frameGeo.top();
+    int dr = frameGeo.right() - geo.right();
+    int db = frameGeo.bottom() - geo.bottom();
+
+    /* Get the best size w/o scroll-bars: */
+    QSize s = sizeHint();
+
+    /* Resize the frame to fit the contents: */
+    s -= size();
+    frameGeo.setRight(frameGeo.right() + s.width());
+    frameGeo.setBottom(frameGeo.bottom() + s.height());
+
+    /* Adjust position if necessary: */
+    if (fAdjustPosition)
+    {
+        QRegion availableGeo;
+        QDesktopWidget *dwt = QApplication::desktop();
+        if (dwt->isVirtualDesktop())
+            /* Compose complex available region: */
+            for (int i = 0; i < dwt->numScreens(); ++i)
+                availableGeo += dwt->availableGeometry(i);
+        else
+            /* Get just a simple available rectangle */
+            availableGeo = dwt->availableGeometry(pos());
+
+        frameGeo = VBoxGlobal::normalizeGeometry(frameGeo, availableGeo);
+    }
+
+    /* Finally, set the frame geometry: */
+    setGeometry(frameGeo.left() + dl, frameGeo.top() + dt,
+                frameGeo.width() - dl - dr, frameGeo.height() - dt - db);
+
+#else /* !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
+    Q_UNUSED(fAdjustPosition);
+#endif /* VBOX_GUI_WITH_CUSTOMIZATIONS1 */
+}
+
 void UIMachineWindowNormal::updateAppearanceOf(int iElement)
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h

@@ -43 +43 @@
 private slots:
 
+#ifdef Q_WS_X11
+    /** X11: Performs machine-window async geometry normalization. */
+    void sltNormalizeGeometry() { normalizeGeometry(true); }
+#endif /* Q_WS_X11 */
+
     /* Session event-handlers: */
     void sltMachineStateChanged();
@@ -82 +87 @@
     void showInNecessaryMode();
 
+    /* Helper: Machine-window geometry stuff: */
+    void normalizeGeometry(bool fAdjustPosition);
+
     /* Update stuff: */
     void updateAppearanceOf(int aElement);

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

@@ -65 +65 @@
     /* Private helpers: */
     QSize sizeHint() const;
-    void normalizeGeometry(bool /* fAdjustPosition */) {}
     QRect workingArea() const;
     QSize calculateMaxGuestSize() const;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp

@@ -72 +72 @@
 void UIMachineViewSeamless::sltAdditionsStateChanged()
 {
-    normalizeGeometry(false);
+    maybeAdjustGuestScreenSize();
 }
 
@@ -154 +154 @@
 }
 
-void UIMachineViewSeamless::normalizeGeometry(bool /* fAdjustPosition */)
+/** Adjusts guest screen size to correspond current <i>working area</i> size. */
+void UIMachineViewSeamless::maybeAdjustGuestScreenSize()
 {
     /* Check if we should adjust guest to new size: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.h

@@ -64 +64 @@
     //void cleanupCommon() {}
 
-    /* Private helpers: */
-    void normalizeGeometry(bool fAdjustPosition);
+    /* Helpers: Geometry stuff: */
+    void maybeAdjustGuestScreenSize();
     QRect workingArea() const;
     QSize calculateMaxGuestSize() const;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

@@ -197 +197 @@
     /* Resize to the appropriate size: */
     resize(workingArea.size());
-    /* Adjust guest if necessary: */
-    machineView()->normalizeGeometry(false);
+    /* Adjust guest screen size if necessary: */
+    machineView()->maybeAdjustGuestScreenSize();
 #ifndef Q_WS_MAC
     /* Move mini-toolbar into appropriate place: */