Changeset 58011 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 2, 2015 2:40:28 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: Update IDisplay's viewport, e.g. 3D overlay, when moving VM window from Retina host-screen to non-Retina host-screen and at the end of to/from native full-screen transactions.

Location:

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

Files:

• UIMachineView.cpp (modified) (8 diffs)
• UIMachineView.h (modified) (3 diffs)
• fullscreen/UIMachineWindowFullscreen.cpp (modified) (2 diffs)
• scale/UIMachineViewScale.cpp (modified) (1 diff)

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

@@ -218 +218 @@
     frameBuffer()->performRescale();
 
-    // TODO: How to make it work?
+    /* Update console's display viewport and 3D overlay: */
+    updateViewport();
+}
+
+double UIMachineView::aspectRatio() const
+{
+    return frameBuffer() ? (double)(frameBuffer()->width()) / frameBuffer()->height() : 0;
+}
+
+void UIMachineView::updateViewport()
+{
     display().ViewportChanged(screenId(), contentsX(), contentsY(), visibleWidth(), visibleHeight());
-}
-
-double UIMachineView::aspectRatio() const
-{
-    return frameBuffer() ? (double)(frameBuffer()->width()) / frameBuffer()->height() : 0;
 }
 
@@ -426 +431 @@
     viewport()->update();
 
-    // TODO: How to make it work?
-    display().ViewportChanged(screenId(), contentsX(), contentsY(), visibleWidth(), visibleHeight());
+    /* Update console's display viewport and 3D overlay: */
+    updateViewport();
 }
 
@@ -480 +485 @@
     viewport()->update();
 
-    // TODO: How to make it work?
-    display().ViewportChanged(screenId(), contentsX(), contentsY(), visibleWidth(), visibleHeight());
+    /* Update console's display viewport and 3D overlay: */
+    updateViewport();
 }
 
@@ -554 +559 @@
     , m_pFrameBuffer(0)
     , m_previousState(KMachineState_Null)
+#ifdef Q_WS_MAC
+    , m_iHostScreenNumber(0)
+#endif /* Q_WS_MAC */
     , m_maxGuestSizePolicy(MaxGuestSizePolicy_Invalid)
     , m_u64MaxGuestSize(0)
@@ -1241 +1249 @@
     QAbstractScrollArea::scrollContentsBy(dx, dy);
 
-    display().ViewportChanged(screenId(),
-                              contentsX(), contentsY(),
-                              visibleWidth(), visibleHeight());
+    /* Update console's display viewport and 3D overlay: */
+    updateViewport();
 }
 
@@ -1342 +1349 @@
                     m_pFrameBuffer->viewportResized(pResizeEvent);
 #endif /* VBOX_WITH_VIDEOHWACCEL */
-                display().ViewportChanged(screenId(),
-                                          contentsX(), contentsY(),
-                                          visibleWidth(), visibleHeight());
+                /* Update console's display viewport and 3D overlay: */
+                updateViewport();
                 break;
             }
@@ -1358 +1364 @@
             case QEvent::Move:
             {
-                /* In some cases viewport resize-events can provoke the
-                 * machine-view position changes inside the machine-window.
-                 * We have to notify interested listeners like 3D service. */
-                display().ViewportChanged(screenId(),
-                                          contentsX(), contentsY(),
-                                          visibleWidth(), visibleHeight());
+                /* Update console's display viewport and 3D overlay: */
+                updateViewport();
                 break;
             }
@@ -1394 +1396 @@
             case QEvent::Move:
             {
-                if (m_pFrameBuffer)
+                /* Get current host-screen number: */
+                const int iCurrentHostScreenNumber = vboxGlobal().screenNumber(this);
+                if (m_iHostScreenNumber != iCurrentHostScreenNumber)
                 {
-                    /* Update backing-scale-factor for underlying frame-buffer: */
-                    m_pFrameBuffer->setBackingScaleFactor(darwinBackingScaleFactor(machineWindow()));
-                    /* Perform frame-buffer rescaling: */
-                    m_pFrameBuffer->performRescale();
+                    /* Recache current host screen: */
+                    m_iHostScreenNumber = iCurrentHostScreenNumber;
+
+                    /* Update frame-buffer arguments: */
+                    if (m_pFrameBuffer)
+                    {
+                        /* Update backing-scale-factor for underlying frame-buffer: */
+                        m_pFrameBuffer->setBackingScaleFactor(darwinBackingScaleFactor(machineWindow()));
+                        /* Perform frame-buffer rescaling: */
+                        m_pFrameBuffer->performRescale();
+                    }
+
+                    /* Update console's display viewport and 3D overlay: */
+                    updateViewport();
                 }
                 break;

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

@@ -108 +108 @@
     double aspectRatio() const;
 
+    /** Updates console's display viewport.
+      * @remarks Used to update 3D-service overlay viewport as well. */
+    void updateViewport();
+
 protected slots:
 
@@ -181 +185 @@
     /** Returns the session's console reference. */
     CConsole& console() const;
-    /** Returns the display's display reference. */
+    /** Returns the console's display reference. */
     CDisplay& display() const;
     /** Returns the console's guest reference. */
@@ -349 +353 @@
     QSize m_sizeHintOverride;
 
+#ifdef Q_WS_MAC
+    /** Holds current host-screen number. */
+    int m_iHostScreenNumber;
+#endif /* Q_WS_MAC */
+
     /** The policy for calculating the maximum guest resolution which we wish
      * to handle. */

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

@@ -82 +82 @@
         LogRel(("UIMachineWindowFullscreen::handleNativeNotification: "
                 "Native fullscreen mode entered, notifying listener...\n"));
+        /* Update console's display viewport and 3D overlay: */
+        machineView()->updateViewport();
         emit sigNotifyAboutNativeFullscreenDidEnter();
     }
@@ -98 +100 @@
         LogRel(("UIMachineWindowFullscreen::handleNativeNotification: "
                 "Native fullscreen mode exited, notifying listener...\n"));
+        /* Update console's display viewport and 3D overlay: */
+        machineView()->updateViewport();
         emit sigNotifyAboutNativeFullscreenDidExit();
     }

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

@@ -146 +146 @@
     frameBuffer()->performRescale();
 
-    // TODO: How to make it work?
-    display().ViewportChanged(screenId(), contentsX(), contentsY(), visibleWidth(), visibleHeight());
+    /* Update console's display viewport and 3D overlay: */
+    updateViewport();
 }