Changeset 52705 in vbox

Timestamp:

Sep 11, 2014 3:12:06 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

96041

Message:

FE/Qt: Runtime UI: Geometry adjustment code refactoring (better encapsulation for that mess, renaming to more logical names); Mini-toolbar update bug-fix on machine-window geometry adjustment.

Location:

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

Files:

• UIMachineLogic.cpp (modified) (1 diff)
• UIMachineLogic.h (modified) (1 diff)
• UIMachineView.h (modified) (1 diff)
• UIMachineWindow.cpp (modified) (1 diff)
• UIMachineWindow.h (modified) (1 diff)
• UISession.cpp (modified) (1 diff)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (4 diffs)
• fullscreen/UIMachineLogicFullscreen.h (modified) (1 diff)
• fullscreen/UIMachineViewFullscreen.cpp (modified) (2 diffs)
• fullscreen/UIMachineViewFullscreen.h (modified) (1 diff)
• fullscreen/UIMachineWindowFullscreen.cpp (modified) (3 diffs)
• fullscreen/UIMachineWindowFullscreen.h (modified) (1 diff)
• normal/UIMachineViewNormal.cpp (modified) (2 diffs)
• normal/UIMachineViewNormal.h (modified) (1 diff)
• seamless/UIMachineLogicSeamless.cpp (modified) (2 diffs)
• seamless/UIMachineLogicSeamless.h (modified) (1 diff)
• seamless/UIMachineViewSeamless.cpp (modified) (2 diffs)
• seamless/UIMachineViewSeamless.h (modified) (1 diff)
• seamless/UIMachineWindowSeamless.cpp (modified) (1 diff)
• seamless/UIMachineWindowSeamless.h (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()
-{
+void UIMachineLogic::adjustMachineWindowsGeometry()
+{
+    /* By default, the only thing we need is to
+     * adjust machine-view size(s) if necessary: */
     foreach(UIMachineWindow *pMachineWindow, machineWindows())
-        pMachineWindow->machineView()->maybeAdjustGuestScreenSize();
+        pMachineWindow->adjustMachineViewSize();
 }
 

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

@@ -91 +91 @@
     void setPreventAutoClose(bool fIsPreventAutoClose) { m_fIsPreventAutoClose = fIsPreventAutoClose; }
 
-    /* API: Guest screen size stuff: */
-    virtual void maybeAdjustGuestScreenSize();
+    /** Adjusts machine-window(s) geometry if necessary. */
+    virtual void adjustMachineWindowsGeometry();
 
     /* Wrapper to open Machine settings / Network page: */

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

@@ -85 +85 @@
     virtual void setGuestAutoresizeEnabled(bool /* fEnabled */) {}
 
-    /** Adjusts guest screen size to correspond current machine-window size.
+    /** Adjusts guest-screen size to correspond current visual-style.
       * @note Reimplemented in sub-classes. Base implementation does nothing. */
-    virtual void maybeAdjustGuestScreenSize() {}
+    virtual void adjustGuestScreenSize() {}
 
     /* Framebuffer aspect ratio: */

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

@@ -210 +210 @@
 }
 
+void UIMachineWindow::adjustMachineViewSize()
+{
+    /* By default, the only thing we need is to
+     * adjust guest-screen size if necessary: */
+    machineView()->adjustGuestScreenSize();
+}
+
 #ifndef VBOX_WITH_TRANSLUCENT_SEAMLESS
 void UIMachineWindow::setMask(const QRegion &region)

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

@@ -70 +70 @@
     CMachine machine() const;
 
-    /** Adjusts machine-window size to correspond current guest screen size.
+    /** Adjusts machine-window size to correspond current machine-view 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); }
+
+    /** Adjusts machine-view size to correspond current machine-window size. */
+    virtual void adjustMachineViewSize();
 
 #ifndef VBOX_WITH_TRANSLUCENT_SEAMLESS

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

@@ -282 +282 @@
     {
         msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_state_restore_90px.png", 0, 0);
-        /* After restoring from 'saved' state, guest screen size should be adjusted: */
-        machineLogic()->maybeAdjustGuestScreenSize();
+        /* After restoring from 'saved' state, machine-window(s) geometry should be adjusted: */
+        machineLogic()->adjustMachineWindowsGeometry();
     }
     else

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

@@ -98 +98 @@
 }
 
-/** Adjusts guest screen count/size for the machine-logic we have. */
-void UIMachineLogicFullscreen::maybeAdjustGuestScreenSize()
-{
-    LogRel(("UIMachineLogicFullscreen::maybeAdjustGuestScreenSize"));
+void UIMachineLogicFullscreen::adjustMachineWindowsGeometry()
+{
+    LogRel(("UIMachineLogicFullscreen::adjustMachineWindowsGeometry\n"));
 
     /* Rebuild multi-screen layout: */
@@ -114 +113 @@
             pMachineWindow->showInNecessaryMode();
     }
-    /* Revalidate native fullscreen for ML and next: */
+    /* For ML and next revalidate native fullscreen: */
     else revalidateNativeFullScreen();
 #else /* !Q_WS_MAC */
@@ -363 +362 @@
     if (uisession()->isRunning() && uisession()->wasPaused())
     {
-        LogRelFlow(("UIMachineLogicFullscreen: "
-                    "Machine-state changed from 'paused' to 'running': "
-                    "Updating screen-layout...\n"));
+        LogRel(("UIMachineLogicFullscreen::sltMachineStateChanged:"
+                "Machine-state changed from 'paused' to 'running': "
+                "Adjust machine-window geometry...\n"));
 
         /* Make sure further code will be called just once: */
         uisession()->forgetPreviousMachineState();
-        /* Adjust guest-screen size if necessary: */
-        maybeAdjustGuestScreenSize();
+        /* Adjust machine-window geometry if necessary: */
+        adjustMachineWindowsGeometry();
     }
 }
@@ -802 +801 @@
                         "Ask machine-window #%d to adjust guest geometry.\n", (int)uScreenID));
 
-                /* Adjust guest screen size if necessary: */
-                pMachineWindow->machineView()->maybeAdjustGuestScreenSize();
+                /* Just adjust machine-view size if necessary: */
+                pMachineWindow->adjustMachineViewSize();
             }
         }

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

@@ -62 +62 @@
     virtual Qt::WindowFlags windowFlags(ulong uScreenId) const;
 
+    /** Adjusts machine-window geometry if necessary for 'Fullscreen'. */
+    virtual void adjustMachineWindowsGeometry();
+
     /* Helpers: Multi-screen stuff: */
-    void maybeAdjustGuestScreenSize();
     int hostScreenForGuestScreen(int iScreenId) const;
     bool hasHostScreenForGuestScreen(int iScreenId) const;

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

@@ -63 +63 @@
 void UIMachineViewFullscreen::sltAdditionsStateChanged()
 {
-    maybeAdjustGuestScreenSize();
+    adjustGuestScreenSize();
 }
 
@@ -136 +136 @@
 }
 
-/** Adjusts guest screen size to correspond current <i>working area</i> size. */
-void UIMachineViewFullscreen::maybeAdjustGuestScreenSize()
+void UIMachineViewFullscreen::adjustGuestScreenSize()
 {
-    /* Check if we should adjust guest to new size: */
+    /* Check if we should adjust guest-screen to new size: */
     if (frameBuffer()->isAutoEnabled() ||
         (int)frameBuffer()->width() != workingArea().size().width() ||

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

@@ -62 +62 @@
     void setGuestAutoresizeEnabled(bool bEnabled);
 
+    /** Adjusts guest-screen size to correspond current <i>working area</i> size. */
+    void adjustGuestScreenSize();
+
     /* Helpers: Geometry stuff: */
-    void maybeAdjustGuestScreenSize();
     QRect workingArea() const;
     QSize calculateMaxGuestSize() const;

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

@@ -347 +347 @@
         return;
 
-    /* Which host-screen should that machine-window located on? */
-    const int iHostScreen = pFullscreenLogic->hostScreenForGuestScreen(m_uScreenId);
-
 #ifdef Q_WS_X11
     /* On X11 calling placeOnScreen() is only needed for legacy window managers
@@ -381 +378 @@
          * Apparently some window managers will not respond to requests for
          * unmapped windows, so do this *after* the call to showFullScreen(). */
-        VBoxGlobal::setFullScreenMonitorX11(this, iHostScreen);
+        VBoxGlobal::setFullScreenMonitorX11(this, pFullscreenLogic->hostScreenForGuestScreen(m_uScreenId));
     }
     else
@@ -392 +389 @@
 #endif /* Q_WS_X11 */
 
-    /* Adjust guest-screen size if necessary: */
-    machineView()->maybeAdjustGuestScreenSize();
-
-    /* Show/Move mini-toolbar into appropriate place: */
+    /* Adjust machine-view size if necessary: */
+    adjustMachineViewSize();
+
+    /* Show mini-toolbar: */
     if (m_pMiniToolBar)
-    {
         m_pMiniToolBar->show();
-        m_pMiniToolBar->adjustGeometry(iHostScreen);
-    }
 
     /* Make sure machine-view have focus: */
     m_pMachineView->setFocus();
+}
+
+void UIMachineWindowFullscreen::adjustMachineViewSize()
+{
+    /* Call to base-class: */
+    UIMachineWindow::adjustMachineViewSize();
+
+    /* If mini-toolbar present: */
+    if (m_pMiniToolBar)
+    {
+        /* Make sure this window has fullscreen logic: */
+        UIMachineLogicFullscreen *pFullscreenLogic = qobject_cast<UIMachineLogicFullscreen*>(machineLogic());
+        AssertPtrReturnVoid(pFullscreenLogic);
+
+        /* Which host-screen should that machine-window located on? */
+        const int iHostScreen = pFullscreenLogic->hostScreenForGuestScreen(m_uScreenId);
+
+        /* Move mini-toolbar into appropriate place: */
+        m_pMiniToolBar->adjustGeometry(iHostScreen);
+    }
 }
 

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

@@ -86 +86 @@
     void showInNecessaryMode();
 
+    /** Adjusts machine-view size to correspond current machine-window size. */
+    virtual void adjustMachineViewSize();
+
     /* Update stuff: */
     void updateAppearanceOf(int iElement);

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

@@ -65 +65 @@
 void UIMachineViewNormal::sltAdditionsStateChanged()
 {
-    maybeAdjustGuestScreenSize();
+    adjustGuestScreenSize();
 }
 
@@ -161 +161 @@
 }
 
-/** 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();
+void UIMachineViewNormal::adjustGuestScreenSize()
+{
+    /* Check if we should adjust guest-screen to new size: */
+    const QSize centralWidgetSize = machineWindow()->centralWidget()->size();
     if ((int)frameBuffer()->width() != centralWidgetSize.width() ||
         (int)frameBuffer()->height() != centralWidgetSize.height())

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

@@ -67 +67 @@
     void maybeResendSizeHint();
 
+    /** Adjusts guest-screen size to correspond current <i>machine-window</i> size. */
+    void adjustGuestScreenSize();
+
     /* Private helpers: */
-    void maybeAdjustGuestScreenSize();
     QRect workingArea() const;
     QSize calculateMaxGuestSize() const;

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

@@ -85 +85 @@
 }
 
-/** Adjusts guest screen count/size for the machine-logic we have. */
-void UIMachineLogicSeamless::maybeAdjustGuestScreenSize()
-{
-    LogRel(("UIMachineLogicSeamless::maybeAdjustGuestScreenSize"));
+void UIMachineLogicSeamless::adjustMachineWindowsGeometry()
+{
+    LogRel(("UIMachineLogicSeamless::adjustMachineWindowsGeometry\n"));
 
     /* Rebuild multi-screen layout: */
@@ -144 +143 @@
     if (uisession()->isRunning() && uisession()->wasPaused())
     {
-        LogRelFlow(("UIMachineLogicSeamless: "
-                    "Machine-state changed from 'paused' to 'running': "
-                    "Updating screen-layout...\n"));
+        LogRel(("UIMachineLogicSeamless::sltMachineStateChanged:"
+                "Machine-state changed from 'paused' to 'running': "
+                "Adjust machine-window geometry...\n"));
 
         /* Make sure further code will be called just once: */
         uisession()->forgetPreviousMachineState();
-        /* Adjust guest-screen size if necessary: */
-        maybeAdjustGuestScreenSize();
+        /* Adjust machine-window geometry if necessary: */
+        adjustMachineWindowsGeometry();
     }
 }

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

@@ -41 +41 @@
     virtual Qt::WindowFlags windowFlags(ulong uScreenId) const { Q_UNUSED(uScreenId); return Qt::FramelessWindowHint; }
 
+    /** Adjusts machine-window geometry if necessary for 'Seamless'. */
+    virtual void adjustMachineWindowsGeometry();
+
     /* Helpers: Multi-screen stuff: */
-    void maybeAdjustGuestScreenSize();
     int hostScreenForGuestScreen(int iScreenId) const;
     bool hasHostScreenForGuestScreen(int iScreenId) const;

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

@@ -72 +72 @@
 void UIMachineViewSeamless::sltAdditionsStateChanged()
 {
-    maybeAdjustGuestScreenSize();
+    adjustGuestScreenSize();
 }
 
@@ -154 +154 @@
 }
 
-/** Adjusts guest screen size to correspond current <i>working area</i> size. */
-void UIMachineViewSeamless::maybeAdjustGuestScreenSize()
+void UIMachineViewSeamless::adjustGuestScreenSize()
 {
-    /* Check if we should adjust guest to new size: */
+    /* Check if we should adjust guest-screen to new size: */
     if (frameBuffer()->isAutoEnabled() ||
         (int)frameBuffer()->width() != workingArea().size().width() ||

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

@@ -64 +64 @@
     //void cleanupCommon() {}
 
+    /** Adjusts guest-screen size to correspond current <i>working area</i> size. */
+    void adjustGuestScreenSize();
+
     /* Helpers: Geometry stuff: */
-    void maybeAdjustGuestScreenSize();
     QRect workingArea() const;
     QSize calculateMaxGuestSize() const;

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

@@ -200 +200 @@
     show();
 
-    /* Adjust guest screen size if necessary: */
-    machineView()->maybeAdjustGuestScreenSize();
-
-#ifndef Q_WS_MAC
-    /* Show/Move mini-toolbar into appropriate place: */
+    /* Adjust machine-view size if necessary: */
+    adjustMachineViewSize();
+
+#ifndef Q_WS_MAC
+    /* Show mini-toolbar: */
+    if (m_pMiniToolBar)
+        m_pMiniToolBar->show();
+#endif /* !Q_WS_MAC */
+
+    /* Make sure machine-view have focus: */
+    m_pMachineView->setFocus();
+}
+
+void UIMachineWindowSeamless::adjustMachineViewSize()
+{
+    /* Call to base-class: */
+    UIMachineWindow::adjustMachineViewSize();
+
+#ifndef Q_WS_MAC
+    /* If mini-toolbar present: */
     if (m_pMiniToolBar)
     {
-        m_pMiniToolBar->show();
-        m_pMiniToolBar->adjustGeometry();
+        /* Make sure this window has seamless logic: */
+        const UIMachineLogicFullscreen *pSeamlessLogic = qobject_cast<UIMachineLogicSeamless*>(machineLogic());
+        AssertPtrReturnVoid(pSeamlessLogic);
+
+        /* Which host-screen should that machine-window located on? */
+        const int iHostScreen = pSeamlessLogic->hostScreenForGuestScreen(m_uScreenId);
+
+        /* Move mini-toolbar into appropriate place: */
+        m_pMiniToolBar->adjustGeometry(iHostScreen);
     }
 #endif /* !Q_WS_MAC */
-
-    /* Make sure machine-view have focus: */
-    m_pMachineView->setFocus();
 }
 

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

@@ -64 +64 @@
     void showInNecessaryMode();
 
+    /** Adjusts machine-view size to correspond current machine-window size. */
+    virtual void adjustMachineViewSize();
+
 #ifndef Q_WS_MAC
     /* Update routines: */