Changeset 53389 in vbox for trunk/src

Timestamp:

Nov 24, 2014 4:19:34 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 6278: Support for scaled video-output: Handle runtime scale-factor changes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• runtime/UIFrameBuffer.cpp (modified) (3 diffs)
• runtime/UIFrameBuffer.h (modified) (2 diffs)
• runtime/UIMachineView.cpp (modified) (2 diffs)
• runtime/UIMachineView.h (modified) (1 diff)
• runtime/fullscreen/UIMachineViewFullscreen.cpp (modified) (2 diffs)
• runtime/normal/UIMachineViewNormal.cpp (modified) (1 diff)
• runtime/seamless/UIMachineViewSeamless.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -3568 +3568 @@
                  strKey == GUI_StatusBar_IndicatorOrder)
             emit sigStatusBarConfigurationChange(strMachineID);
+        /* Scale-factor change: */
+        else if (strKey == GUI_ScaleFactor)
+            emit sigScaleFactorChange(strMachineID);
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -75 +75 @@
     /** Notifies about HID LEDs synchronization state change. */
     void sigHidLedsSyncStateChange(bool fEnabled);
+
+    /** Notifies about the scale-factor change. */
+    void sigScaleFactorChange(const QString &strMachineID);
 
 #ifdef RT_OS_DARWIN

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

@@ -764 +764 @@
 #endif /* VBOX_WITH_VIDEOHWACCEL */
 
+void UIFrameBuffer::sltHandleScaleFactorChange(const QString &strMachineID)
+{
+    /* Skip unrelated machine IDs: */
+    if (strMachineID != vboxGlobal().managedVMUuid())
+        return;
+
+    /* Fetch new scale-factor: */
+    m_dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
+}
+
 void UIFrameBuffer::prepareConnections()
 {
+    /* EMT connections: */
     connect(this, SIGNAL(sigNotifyChange(int, int)),
             m_pMachineView, SLOT(sltHandleNotifyChange(int, int)),
@@ -778 +789 @@
             m_pMachineView, SLOT(sltHandle3DOverlayVisibilityChange(bool)),
             Qt::QueuedConnection);
+
+    /* Extra-data manager connections: */
+    connect(gEDataManager, SIGNAL(sigScaleFactorChange(const QString&)),
+            this, SLOT(sltHandleScaleFactorChange(const QString&)));
 }
 
 void UIFrameBuffer::cleanupConnections()
 {
+    /* EMT connections: */
     disconnect(this, SIGNAL(sigNotifyChange(int, int)),
                m_pMachineView, SLOT(sltHandleNotifyChange(int, int)));
@@ -790 +806 @@
     disconnect(this, SIGNAL(sigNotifyAbout3DOverlayVisibilityChange(bool)),
                m_pMachineView, SLOT(sltHandle3DOverlayVisibilityChange(bool)));
+
+    /* Extra-data manager connections: */
+    disconnect(gEDataManager, SIGNAL(sigScaleFactorChange(const QString&)),
+               this, SLOT(sltHandleScaleFactorChange(const QString&)));
 }
 

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

@@ -223 +223 @@
     void setBackingScaleFactor(double dBackingScaleFactor) { m_dBackingScaleFactor = dBackingScaleFactor; }
 
+protected slots:
+
+    /** Handles the scale-factor change. */
+    void sltHandleScaleFactorChange(const QString &strMachineID);
+
 protected:
 
@@ -278 +283 @@
      * @{ */
     /** Holds the scale-factor used by the scaled-size. */
-    const double m_dScaleFactor;
+    double m_dScaleFactor;
     /** Holds the frame-buffer's scaled-size. */
     QSize m_scaledSize;

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

@@ -316 +316 @@
 {
     setMaxGuestSize();
+}
+
+void UIMachineView::sltHandleScaleFactorChange(const QString &strMachineID)
+{
+    /* Skip unrelated machine IDs: */
+    if (strMachineID != vboxGlobal().managedVMUuid())
+        return;
+
+    /* Adjust frame-buffer, machine-window and guest-screen size if necessary: */
+    sltHandleNotifyChange(frameBuffer()->width(), frameBuffer()->height());
+    machineWindow()->normalizeGeometry(true /* adjust position */);
+    adjustGuestScreenSize();
 }
 
@@ -540 +552 @@
     connect(QApplication::desktop(), SIGNAL(resized(int)), this,
             SLOT(sltDesktopResized()));
+    /* Scale-factor change: */
+    connect(gEDataManager, SIGNAL(sigScaleFactorChange(const QString&)),
+            this, SLOT(sltHandleScaleFactorChange(const QString&)));
 }
 

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

@@ -113 +113 @@
     /* Watch dog for desktop resizes: */
     void sltDesktopResized();
+
+    /** Handles the scale-factor change. */
+    void sltHandleScaleFactorChange(const QString &strMachineID);
 
     /* Console callback handlers: */

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

@@ -37 +37 @@
 # include "UIMachineViewFullscreen.h"
 # include "UIFrameBuffer.h"
+# include "UIExtraDataManager.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -144 +145 @@
 void UIMachineViewFullscreen::adjustGuestScreenSize()
 {
+    /* Acquire working-area size: */
+    const QSize workingAreaSize = workingArea().size();
+    /* Acquire frame-buffer size: */
+    QSize frameBufferSize(frameBuffer()->width(), frameBuffer()->height());
+    /* Take the scale-factor into account: */
+    frameBufferSize *= gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
     /* Check if we should adjust guest-screen to new size: */
     if (frameBuffer()->isAutoEnabled() ||
-        (int)frameBuffer()->width() != workingArea().size().width() ||
-        (int)frameBuffer()->height() != workingArea().size().height())
+        frameBufferSize != workingAreaSize)
         if (m_bIsGuestAutoresizeEnabled &&
             uisession()->isGuestSupportsGraphics() &&

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

@@ -168 +168 @@
 void UIMachineViewNormal::adjustGuestScreenSize()
 {
+    /* Acquire central-widget size: */
+    const QSize centralWidgetSize = machineWindow()->centralWidget()->size();
+    /* Acquire frame-buffer size: */
+    QSize frameBufferSize(frameBuffer()->width(), frameBuffer()->height());
+    /* Take the scale-factor into account: */
+    frameBufferSize *= gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
     /* 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())
+    if (frameBufferSize != centralWidgetSize)
         if (m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
             sltPerformGuestResize(centralWidgetSize);

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

@@ -36 +36 @@
 # include "UIMachineViewSeamless.h"
 # include "UIFrameBuffer.h"
+# include "UIExtraDataManager.h"
 
 /* COM includes: */
@@ -161 +162 @@
 void UIMachineViewSeamless::adjustGuestScreenSize()
 {
+    /* Acquire working-area size: */
+    const QSize workingAreaSize = workingArea().size();
+    /* Acquire frame-buffer size: */
+    QSize frameBufferSize(frameBuffer()->width(), frameBuffer()->height());
+    /* Take the scale-factor into account: */
+    frameBufferSize *= gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
     /* Check if we should adjust guest-screen to new size: */
     if (frameBuffer()->isAutoEnabled() ||
-        (int)frameBuffer()->width() != workingArea().size().width() ||
-        (int)frameBuffer()->height() != workingArea().size().height())
+        frameBufferSize != workingAreaSize)
         if (uisession()->isGuestSupportsGraphics() &&
             uisession()->isScreenVisible(screenId()))