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

Timestamp:

Feb 22, 2018 2:14:16 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8694: Runtime UI: Remove possibility to configure Unscaled HiDPI Output feature as it will be later determined on the basis of scaling-factor; for now it's just always true for Windows/Linux and always false for macOS.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (3 diffs)
• extradata/UIExtraDataManager.h (modified) (2 diffs)
• runtime/UIMachineView.cpp (modified) (5 diffs)
• runtime/UIMachineView.h (modified) (1 diff)
• selector/UISnapshotDetailsWidget.cpp (modified) (2 diffs)
• selector/UISnapshotDetailsWidget.h (modified) (1 diff)
• selector/graphics/details/UIGDetailsElements.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (9 diffs)
• settings/machine/UIMachineSettingsDisplay.ui (modified) (3 diffs)

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

@@ -155 +155 @@
 const char* UIExtraDataDefs::GUI_Accelerate2D_PixformatAYUV = "GUI/Accelerate2D/PixformatAYUV";
 #endif /* VBOX_WITH_VIDEOHWACCEL */
-const char* UIExtraDataDefs::GUI_HiDPI_UnscaledOutput = "GUI/HiDPI/UnscaledOutput";
 #ifndef VBOX_WS_MAC
 const char* UIExtraDataDefs::GUI_ShowMiniToolBar = "GUI/ShowMiniToolBar";

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

@@ -278 +278 @@
         extern const char* GUI_Accelerate2D_PixformatAYUV;
 #endif /* VBOX_WITH_VIDEOHWACCEL */
-        /** Holds whether Runtime UI should use unscaled HiDPI output. */
-        extern const char* GUI_HiDPI_UnscaledOutput;
 #ifndef VBOX_WS_MAC
         /** Holds whether mini-toolbar is enabled for full and seamless screens. */

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

@@ -1996 +1996 @@
            << GUI_Accelerate2D_PixformatYUY2 << GUI_Accelerate2D_PixformatAYUV
 #endif /* VBOX_WITH_VIDEOHWACCEL */
-           << GUI_HiDPI_UnscaledOutput
 #ifndef VBOX_WS_MAC
            << GUI_ShowMiniToolBar << GUI_MiniToolBarAutoHide << GUI_MiniToolBarAlignment
@@ -3720 +3719 @@
 }
 #endif /* VBOX_WITH_VIDEOHWACCEL */
-
-bool UIExtraDataManager::useUnscaledHiDPIOutput(const QString &strID)
-{
-#ifdef VBOX_WS_MAC
-    /* 'False' unless feature allowed: */
-    return isFeatureAllowed(GUI_HiDPI_UnscaledOutput, strID);
-#else
-    /* 'True' unless feature restricted: */
-    return !isFeatureRestricted(GUI_HiDPI_UnscaledOutput, strID);
-#endif
-}
-
-void UIExtraDataManager::setUseUnscaledHiDPIOutput(bool fUseUnscaledHiDPIOutput, const QString &strID)
-{
-#ifdef VBOX_WS_MAC
-    /* 'True' if feature allowed, null-string otherwise: */
-    setExtraDataString(GUI_HiDPI_UnscaledOutput, toFeatureAllowed(fUseUnscaledHiDPIOutput), strID);
-#else
-    /* 'False' if feature restricted, null-string otherwise: */
-    setExtraDataString(GUI_HiDPI_UnscaledOutput, toFeatureRestricted(!fUseUnscaledHiDPIOutput), strID);
-#endif
-}
 
 #ifndef VBOX_WS_MAC
@@ -4409 +4386 @@
         else if (strKey == GUI_Scaling_Optimization)
             emit sigScalingOptimizationTypeChange(strMachineID);
-        /* Unscaled HiDPI Output mode change: */
-        else if (strKey == GUI_HiDPI_UnscaledOutput)
-            emit sigUnscaledHiDPIOutputModeChange(strMachineID);
     }
 

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

@@ -89 +89 @@
     void sigHiDPIOptimizationTypeChange(const QString &strMachineID);
 #endif
-
-    /** Notifies about unscaled HiDPI output mode change. */
-    void sigUnscaledHiDPIOutputModeChange(const QString &strMachineID);
 
 #ifdef RT_OS_DARWIN
@@ -529 +526 @@
         bool usePixelFormatAYUV(const QString &strID);
 #endif /* VBOX_WITH_VIDEOHWACCEL */
-
-        /** 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);
 
 #ifndef VBOX_WS_MAC

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

@@ -249 +249 @@
     /* Take the scale-factor related attributes into account: */
     const double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
-    const bool fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid());
+#ifdef VBOX_WS_MAC
+    const bool fUseUnscaledHiDPIOutput = false;
+#else
+    const bool fUseUnscaledHiDPIOutput = true;
+#endif
     frameBuffer()->setScaleFactor(dScaleFactor);
     frameBuffer()->setUseUnscaledHiDPIOutput(fUseUnscaledHiDPIOutput);
@@ -502 +506 @@
     /* Take the scale-factor into account: */
     const double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
-    const bool fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid());
+#ifdef VBOX_WS_MAC
+    const bool fUseUnscaledHiDPIOutput = false;
+#else
+    const bool fUseUnscaledHiDPIOutput = true;
+#endif
     Q_UNUSED(fUseUnscaledHiDPIOutput);
     frameBuffer()->setScaleFactor(dScaleFactor);
@@ -546 +554 @@
     /* Update viewport: */
     viewport()->update();
-}
-
-void UIMachineView::sltHandleUnscaledHiDPIOutputModeChange(const QString &strMachineID)
-{
-    /* Skip unrelated machine IDs: */
-    if (strMachineID != vboxGlobal().managedVMUuid())
-        return;
-
-    /* Take the unscaled HiDPI output mode into account: */
-    const bool fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid());
-    frameBuffer()->setUseUnscaledHiDPIOutput(fUseUnscaledHiDPIOutput);
-    /* Propagate the unscaled HiDPI output mode to 3D service if necessary: */
-    if (machine().GetAccelerate3DEnabled() && vboxGlobal().is3DAvailable())
-        display().NotifyHiDPIOutputPolicyChange(fUseUnscaledHiDPIOutput);
-
-    /* Handle scale attributes change: */
-    handleScaleChange();
-    /* Adjust guest-screen size: */
-    adjustGuestScreenSize();
-
-    /* Update scaled pause pixmap, if necessary: */
-    updateScaledPausePixmap();
-    viewport()->update();
-
-    /* Update console's display viewport and 3D overlay: */
-    updateViewport();
 }
 
@@ -717 +699 @@
         const double dDevicePixelRatioActual = gpDesktop->devicePixelRatioActual(machineWindow());
         const double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
-        const bool fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid());
+#ifdef VBOX_WS_MAC
+        const bool fUseUnscaledHiDPIOutput = false;
+#else
+        const bool fUseUnscaledHiDPIOutput = true;
+#endif
         m_pFrameBuffer->setDevicePixelRatio(dDevicePixelRatioFormal);
         m_pFrameBuffer->setDevicePixelRatioActual(dDevicePixelRatioActual);
@@ -837 +823 @@
     connect(gEDataManager, SIGNAL(sigScalingOptimizationTypeChange(const QString&)),
             this, SLOT(sltHandleScalingOptimizationChange(const QString&)));
-    /* Unscaled HiDPI output mode change: */
-    connect(gEDataManager, SIGNAL(sigUnscaledHiDPIOutputModeChange(const QString&)),
-            this, SLOT(sltHandleUnscaledHiDPIOutputModeChange(const QString&)));
 }
 

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

@@ -131 +131 @@
     /** Handles the scaling-optimization change. */
     void sltHandleScalingOptimizationChange(const QString &strMachineID);
-
-    /** Handles the unscaled HiDPI output mode change. */
-    void sltHandleUnscaledHiDPIOutputModeChange(const QString &strMachineID);
 
     /* Console callback handlers: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotDetailsWidget.cpp

@@ -1288 +1288 @@
             }
 
-#ifdef VBOX_WS_MAC
-            /* Unscaled HiDPI Video Output? */
-            const QString strUnscaledOutput = unscaledOutputReport(comMachine);
-            const QString strUnscaledOutputOld = unscaledOutputReport(comMachineOld);
-            if (!strUnscaledOutput.isNull())
-            {
-                ++iRowCount;
-                strItem += QString(sSectionItemTpl2).arg(QApplication::translate("UIGDetails", "Unscaled HiDPI Video Output", "details (display)"),
-                                                         empReport(strUnscaledOutput, strUnscaledOutputOld));
-            }
-#endif /* VBOX_WS_MAC */
-
             /* Acceleration? */
             const QString strAcceleration = displayAccelerationReport(comMachine);
@@ -1663 +1651 @@
     return dReport;
 }
-
-#ifdef VBOX_WS_MAC
-/* static */
-QString UISnapshotDetailsWidget::unscaledOutputReport(CMachine comMachine)
-{
-    // WORKAROUND:
-    // IMachine::GetExtraData still non-const..
-    CMachine comExtraDataMachine = comMachine;
-    /* Prepare report: */
-    QString strReport;
-    /* Acquire Unscaled Output mode: */
-    const QString strValue = comExtraDataMachine.GetExtraData(UIExtraDataDefs::GUI_HiDPI_UnscaledOutput);
-    {
-        /* Try to convert loaded data to bool: */
-        const bool fEnabled  = strValue.compare("true", Qt::CaseInsensitive) == 0 ||
-                               strValue.compare("yes", Qt::CaseInsensitive) == 0 ||
-                               strValue.compare("on", Qt::CaseInsensitive) == 0 ||
-                               strValue == "1";
-        /* Append information: */
-        if (fEnabled)
-            strReport = QApplication::translate("UIGDetails", "Enabled", "details (display/Unscaled HiDPI Video Output)");
-        else
-            /* strReport = */ QApplication::translate("UIGDetails", "Disabled", "details (display/Unscaled HiDPI Video Output)");
-    }
-    /* Return report: */
-    return strReport;
-}
-#endif /* VBOX_WS_MAC */
 
 /* static */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotDetailsWidget.h

@@ -158 +158 @@
     /** Acquires @a comMachine scale-factor report. */
     static double scaleFactorReport(CMachine comMachine);
-#ifdef VBOX_WS_MAC
-    /** Acquires @a comMachine unscaled output report. */
-    static QString unscaledOutputReport(CMachine comMachine);
-#endif /* VBOX_WS_MAC */
     /** Acquires @a comMachine display acceleration report. */
     static QString displayAccelerationReport(CMachine comMachine);

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp

@@ -419 +419 @@
                                          QString::number(dValue, 'f', 2));
         }
-
-#ifdef VBOX_WS_MAC
-        /* Get 'Unscaled HiDPI Video Output' mode value: */
-        const QString strUnscaledHiDPIMode = machine.GetExtraData(UIExtraDataDefs::GUI_HiDPI_UnscaledOutput);
-        {
-            /* Try to convert loaded data to bool: */
-            const bool fEnabled  = strUnscaledHiDPIMode.compare("true", Qt::CaseInsensitive) == 0 ||
-                                   strUnscaledHiDPIMode.compare("yes", Qt::CaseInsensitive) == 0 ||
-                                   strUnscaledHiDPIMode.compare("on", Qt::CaseInsensitive) == 0 ||
-                                   strUnscaledHiDPIMode == "1";
-            /* Append information: */
-            if (fEnabled)
-                table << UITextTableLine(QApplication::translate("UIGDetails", "Unscaled HiDPI Video Output", "details (display)"),
-                                         QApplication::translate("UIGDetails", "Enabled", "details (display/Unscaled HiDPI Video Output)"));
-        }
-#endif /* VBOX_WS_MAC */
 
         QStringList acceleration;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

@@ -45 +45 @@
         , m_cGuestScreenCount(0)
         , m_dScaleFactor(1.0)
-        , m_fUseUnscaledHiDPIOutput(false)
         , m_f3dAccelerationEnabled(false)
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -73 +72 @@
                && (m_cGuestScreenCount == other.m_cGuestScreenCount)
                && (m_dScaleFactor == other.m_dScaleFactor)
-               && (m_fUseUnscaledHiDPIOutput == other.m_fUseUnscaledHiDPIOutput)
                && (m_f3dAccelerationEnabled == other.m_f3dAccelerationEnabled)
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -227 +225 @@
     /** Holds the guest screen scale-factor. */
     double  m_dScaleFactor;
-    /** Holds whether automatic Retina scaling is disabled. */
-    bool    m_fUseUnscaledHiDPIOutput;
     /** Holds whether the 3D acceleration is enabled. */
     bool    m_f3dAccelerationEnabled;
@@ -347 +343 @@
     oldDisplayData.m_cGuestScreenCount = m_machine.GetMonitorCount();
     oldDisplayData.m_dScaleFactor = gEDataManager->scaleFactor(m_machine.GetId());
-    oldDisplayData.m_fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(m_machine.GetId());
     oldDisplayData.m_f3dAccelerationEnabled = m_machine.GetAccelerate3DEnabled();
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -395 +390 @@
     m_pEditorVideoScreenCount->setValue(oldDisplayData.m_cGuestScreenCount);
     m_pEditorGuestScreenScale->setValue((int)(oldDisplayData.m_dScaleFactor * 100));
-    m_pCheckBoxUnscaledHiDPIOutput->setChecked(oldDisplayData.m_fUseUnscaledHiDPIOutput);
     m_pCheckbox3D->setChecked(oldDisplayData.m_f3dAccelerationEnabled);
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -442 +436 @@
     newDisplayData.m_cGuestScreenCount = m_pEditorVideoScreenCount->value();
     newDisplayData.m_dScaleFactor = (double)m_pEditorGuestScreenScale->value() / 100;
-    newDisplayData.m_fUseUnscaledHiDPIOutput = m_pCheckBoxUnscaledHiDPIOutput->isChecked();
     newDisplayData.m_f3dAccelerationEnabled = m_pCheckbox3D->isChecked();
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -618 +611 @@
     setTabOrder(m_pEditorVideoScreenCount, m_pSliderGuestScreenScale);
     setTabOrder(m_pSliderGuestScreenScale, m_pEditorGuestScreenScale);
-    setTabOrder(m_pEditorGuestScreenScale, m_pCheckBoxUnscaledHiDPIOutput);
-    setTabOrder(m_pCheckBoxUnscaledHiDPIOutput, m_pCheckbox3D);
+    setTabOrder(m_pEditorGuestScreenScale, m_pCheckbox3D);
 #ifdef VBOX_WITH_VIDEOHWACCEL
     setTabOrder(m_pCheckbox3D, m_pCheckbox2DVideo);
@@ -699 +691 @@
     m_pLabelGuestScreenScaleMax->setEnabled(isMachineInValidMode());
     m_pEditorGuestScreenScale->setEnabled(isMachineInValidMode());
-    m_pLabelHiDPI->setEnabled(isMachineInValidMode());
-    m_pCheckBoxUnscaledHiDPIOutput->setEnabled(isMachineInValidMode());
     m_pLabelVideoOptions->setEnabled(isMachineOffline());
     m_pCheckbox3D->setEnabled(isMachineOffline());
@@ -1397 +1387 @@
         if (fSuccess && newDisplayData.m_dScaleFactor != oldDisplayData.m_dScaleFactor)
             /* fSuccess = */ gEDataManager->setScaleFactor(newDisplayData.m_dScaleFactor, strMachineId);
-        /* Save whether Unscaled HiDPI Output is enabled: : */
-        if (fSuccess && newDisplayData.m_fUseUnscaledHiDPIOutput != oldDisplayData.m_fUseUnscaledHiDPIOutput)
-            /* fSuccess = */ gEDataManager->setUseUnscaledHiDPIOutput(newDisplayData.m_fUseUnscaledHiDPIOutput, strMachineId);
     }
     /* Return result: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.ui

@@ -203 +203 @@
           </item>
           <item row="6" column="0">
-           <widget class="QLabel" name="m_pLabelHiDPI">
-            <property name="text">
-             <string>HiDPI Support:</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="1">
-           <widget class="QCheckBox" name="m_pCheckBoxUnscaledHiDPIOutput">
-            <property name="sizePolicy">
-             <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="whatsThis">
-             <string>When checked, guest screen contents will not be scaled up to compensate for high host screen resolutions.</string>
-            </property>
-            <property name="text">
-             <string>Use &amp;Unscaled HiDPI Output</string>
-            </property>
-           </widget>
-          </item>
-          <item row="7" column="0">
            <widget class="QLabel" name="m_pLabelVideoOptions">
             <property name="text">
@@ -238 +212 @@
            </widget>
           </item>
-          <item row="7" column="1">
+          <item row="6" column="1">
            <widget class="QCheckBox" name="m_pCheckbox3D">
             <property name="sizePolicy">
@@ -254 +228 @@
            </widget>
           </item>
-          <item row="8" column="1">
+          <item row="7" column="1">
            <widget class="QCheckBox" name="m_pCheckbox2DVideo">
             <property name="sizePolicy">