Changeset 53461 in vbox for trunk

Timestamp:

Dec 5, 2014 2:11:39 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: 6278: Support for unscaled HiDPI (Retina) video-output: Allow to change the mode on-the-fly.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• extradata/UIExtraDataManager.h (modified) (2 diffs)
• runtime/UIFrameBuffer.cpp (modified) (3 diffs)
• runtime/UIFrameBuffer.h (modified) (1 diff)
• runtime/UIMachineView.cpp (modified) (2 diffs)
• runtime/UIMachineView.h (modified) (1 diff)

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

@@ -3096 +3096 @@
 }
 
+void UIExtraDataManager::setUseUnscaledHiDPIOutput(bool fUseUnscaledHiDPIOutput, const QString &strID)
+{
+    /* 'True' if feature allowed, null-string otherwise: */
+    return setExtraDataString(GUI_HiDPI_UnscaledOutput, toFeatureAllowed(fUseUnscaledHiDPIOutput), strID);
+}
+
 HiDPIOptimizationType UIExtraDataManager::hiDPIOptimizationType(const QString &strID)
 {
@@ -3582 +3588 @@
         else if (strKey == GUI_ScaleFactor)
             emit sigScaleFactorChange(strMachineID);
+        else if (strKey == GUI_HiDPI_UnscaledOutput)
+            emit sigUnscaledHiDPIOutputModeChange(strMachineID);
     }
 

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

@@ -80 +80 @@
 
 #ifdef RT_OS_DARWIN
+    /** Mac OS X: Notifies about unscaled HiDPI output mode change. */
+    void sigUnscaledHiDPIOutputModeChange(const QString &strMachineID);
+
     /** Mac OS X: Notifies about 'presentation mode' status change. */
     void sigPresentationModeChange(bool fEnabled);
@@ -396 +399 @@
         /** Returns whether Runtime UI should use unscaled HiDPI output. */
         bool useUnscaledHiDPIOutput(const QString &strID);
+        /** Defines whether Runtime UI should @a fUseUnscaledHiDPIOutput. */
+        void setUseUnscaledHiDPIOutput(bool fUseUnscaledHiDPIOutput, const QString &strID);
 
         /** Returns Runtime UI HiDPI optimization type. */

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

@@ -775 +775 @@
 }
 
+#ifdef RT_OS_DARWIN
+void UIFrameBuffer::sltHandleUnscaledHiDPIOutputModeChange(const QString &strMachineID)
+{
+    /* Skip unrelated machine IDs: */
+    if (strMachineID != vboxGlobal().managedVMUuid())
+        return;
+
+    /* Fetch new unscaled HiDPI output mode value: */
+    m_fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid());
+}
+#endif /* RT_OS_DARWIN */
+
 void UIFrameBuffer::prepareConnections()
 {
@@ -794 +806 @@
     connect(gEDataManager, SIGNAL(sigScaleFactorChange(const QString&)),
             this, SLOT(sltHandleScaleFactorChange(const QString&)));
+#ifdef Q_WS_MAC
+    connect(gEDataManager, SIGNAL(sigUnscaledHiDPIOutputModeChange(const QString&)),
+            this, SLOT(sltHandleUnscaledHiDPIOutputModeChange(const QString&)));
+#endif /* Q_WS_MAC */
 }
 
@@ -811 +827 @@
     disconnect(gEDataManager, SIGNAL(sigScaleFactorChange(const QString&)),
                this, SLOT(sltHandleScaleFactorChange(const QString&)));
+#ifdef Q_WS_MAC
+    disconnect(gEDataManager, SIGNAL(sigUnscaledHiDPIOutputModeChange(const QString&)),
+               this, SLOT(sltHandleUnscaledHiDPIOutputModeChange(const QString&)));
+#endif /* Q_WS_MAC */
 }
 

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

@@ -230 +230 @@
     /** Handles the scale-factor change. */
     void sltHandleScaleFactorChange(const QString &strMachineID);
+
+#ifdef RT_OS_DARWIN
+    /** Mac OS X: Handles the unscaled HiDPI output mode change. */
+    void sltHandleUnscaledHiDPIOutputModeChange(const QString &strMachineID);
+#endif /* RT_OS_DARWIN */
 
 protected:

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

@@ -360 +360 @@
     adjustGuestScreenSize();
 }
+
+#ifdef RT_OS_DARWIN
+void UIMachineView::sltHandleUnscaledHiDPIOutputModeChange(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();
+}
+#endif /* RT_OS_DARWIN */
 
 void UIMachineView::sltMachineStateChanged()
@@ -586 +600 @@
     connect(gEDataManager, SIGNAL(sigScaleFactorChange(const QString&)),
             this, SLOT(sltHandleScaleFactorChange(const QString&)));
+#ifdef Q_WS_MAC
+    /* Unscaled HiDPI output mode change: */
+    connect(gEDataManager, SIGNAL(sigUnscaledHiDPIOutputModeChange(const QString&)),
+            this, SLOT(sltHandleUnscaledHiDPIOutputModeChange(const QString&)));
+#endif /* Q_WS_MAC */
 }
 

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

@@ -116 +116 @@
     /** Handles the scale-factor change. */
     void sltHandleScaleFactorChange(const QString &strMachineID);
+
+#ifdef RT_OS_DARWIN
+    /** Mac OS X: Handles the unscaled HiDPI output mode change. */
+    void sltHandleUnscaledHiDPIOutputModeChange(const QString &strMachineID);
+#endif /* RT_OS_DARWIN */
 
     /* Console callback handlers: */