Changeset 97307 in vbox for trunk/src/VBox

Timestamp:

Oct 26, 2022 3:28:31 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10313 Adding feature related extra data variables and methods.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• globals/UICommon.cpp (modified) (1 diff)
• globals/UICommon.h (modified) (1 diff)
• settings/editors/UIFontScaleEditor.cpp (modified) (3 diffs)
• settings/editors/UIFontScaleEditor.h (modified) (2 diffs)
• settings/global/UIGlobalSettingsDisplay.cpp (modified) (6 diffs)

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

@@ -207 +207 @@
 const char *UIExtraDataDefs::GUI_ScaleFactor = "GUI/ScaleFactor";
 const char *UIExtraDataDefs::GUI_Scaling_Optimization = "GUI/Scaling/Optimization";
+const char *UIExtraDataDefs::GUI_FontScaleFactor = "GUI/FontScaleFactor";
 
 /* Virtual Machine: Session Information Dialog: */

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

@@ -384 +384 @@
         /** Holds the scaling optimization type. */
         SHARED_LIBRARY_STUFF extern const char *GUI_Scaling_Optimization;
+        /** Holds the font scale factor. */
+        SHARED_LIBRARY_STUFF extern const char *GUI_FontScaleFactor;
     /** @} */
 

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

@@ -2610 +2610 @@
 }
 
+void UIExtraDataManager::setFontScaleFactor(int iFontScaleFactor)
+{
+    int iMax = 200;
+    int iMin = 40;
+    if (iFontScaleFactor < iMin || iFontScaleFactor > iMax)
+        return;
+    setExtraDataString(GUI_FontScaleFactor, QString::number(iFontScaleFactor));
+}
+
+int UIExtraDataManager::fontScaleFactor()
+{
+    QString strFontScaleFactor = extraDataString(GUI_FontScaleFactor);
+    bool fConversion = false;
+    int iScaleFactor = strFontScaleFactor.toInt(&fConversion);
+    int iMax = 200;
+    int iMin = 40;
+    if (!fConversion || iScaleFactor < iMin || iScaleFactor > iMax)
+        return 100;
+    return iScaleFactor;
+}
+
 void UIExtraDataManager::setHostKeyCombination(const QString &strHostCombo)
 {

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

@@ -284 +284 @@
         /* Sets whether host screen saver is disabled when a vm is running. */
         void setDisableHostScreenSaver(bool fActivate);
+        /* Set global font scale factor as percentage. 100% is for no scaling. */
+        void setFontScaleFactor(int iFontScaleFactor);
+        int  fontScaleFactor();
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -730 +730 @@
     m_recentMediaExcludeList << "ad-hoc.viso";
 #endif
+
+    scaleApplicationFont(gEDataManager->fontScaleFactor());
+}
+
+void UICommon::scaleApplicationFont(int iFontScaleFactor)
+{
+    QFont appFont = qApp->font();
+    if (appFont.pixelSize() != -1)
+        appFont.setPixelSize(iFontScaleFactor / 100 * appFont.pixelSize());
+    else
+        appFont.setPointSize(iFontScaleFactor / 100 * appFont.pointSize());
+    qApp->setFont(appFont);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.h

@@ -527 +527 @@
     /** @} */
 
+    /* Scales the qApp's font. iFontScaleFactor is percentage thus 100% is for no scaling. */
+    void scaleApplicationFont(int iFontScaleFactor);
+
 public slots:
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIFontScaleEditor.cpp

@@ -101 +101 @@
 {
     setSpinBoxValue(value);
+    setFontScaleFactor(value);
+}
+
+void UIFontScaleEditor::setFontScaleFactor(int iFontScaleFactor)
+{
+    setSliderValue(iFontScaleFactor);
+    setSpinBoxValue(iFontScaleFactor);
+}
+
+int UIFontScaleEditor::fontScaleFactor() const
+{
+    return m_pScaleSlider->value();
 }
 
@@ -156 +168 @@
     }
 
-    prepareScaleFactorMinMaxValues();
+    prepareScaleFactorMinMax();
     retranslateUi();
 }
 
-void UIFontScaleEditor::prepareScaleFactorMinMaxValues()
-{
-    const int iHostScreenCount = gpDesktop->screenCount();
-    if (iHostScreenCount == 0)
-        return;
-    double dMaxDevicePixelRatio = gpDesktop->devicePixelRatio(0);
-    for (int i = 1; i < iHostScreenCount; ++i)
-        if (dMaxDevicePixelRatio < gpDesktop->devicePixelRatio(i))
-            dMaxDevicePixelRatio = gpDesktop->devicePixelRatio(i);
-
-    const int iMinimum = 100;
-    const int iMaximum = ceil(iMinimum + 100 * dMaxDevicePixelRatio);
+void UIFontScaleEditor::prepareScaleFactorMinMax()
+{
+    m_pScaleSlider->blockSignals(true);
+    m_pScaleSpinBox->blockSignals(true);
+    const int iMinimum = 40;
+    const int iMaximum = 200;
 
     const int iStep = 25;
@@ -182 +188 @@
     m_pScaleSpinBox->setMinimum(iMinimum);
     m_pScaleSpinBox->setMaximum(iMaximum);
+    m_pScaleSlider->blockSignals(false);
+    m_pScaleSpinBox->blockSignals(false);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIFontScaleEditor.h

@@ -63 +63 @@
     void setMinimumLayoutIndent(int iIndent);
 
+    void setFontScaleFactor(int iFontScaleFactor);
+    int fontScaleFactor() const;
+
 protected:
 
@@ -82 +85 @@
     void prepare();
     /** Prepare min/max values of related widgets wrt. device pixel ratio(s). */
-    void prepareScaleFactorMinMaxValues();
-
+    void prepareScaleFactorMinMax();
 
     /** Defines slider's @a iValue. */

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp

@@ -56 +56 @@
                && (m_fActivateHoveredMachineWindow == other.m_fActivateHoveredMachineWindow)
                && (m_fDisableHostScreenSaver == other.m_fDisableHostScreenSaver)
+               && (m_iFontScalingFactor == other.m_iFontScalingFactor)
                   ;
     }
@@ -72 +73 @@
     /** Holds whether we should disable host sceen saver on a vm is running. */
     bool                           m_fDisableHostScreenSaver;
+    /** Holds font scaling factor. */
+    int                            m_iFontScalingFactor;
 };
 
@@ -120 +123 @@
     oldData.m_fDisableHostScreenSaver = gEDataManager->disableHostScreenSaver();
 #endif
+    oldData.m_iFontScalingFactor = gEDataManager->fontScaleFactor();
     m_pCache->cacheInitialData(oldData);
 
@@ -146 +150 @@
         m_pEditorGlobalDisplayFeatures->setDisableHostScreenSaver(oldData.m_fDisableHostScreenSaver);
     }
+    if (m_pFontScaleEditor)
+        m_pFontScaleEditor->setFontScaleFactor(oldData.m_iFontScalingFactor);
 }
 
@@ -167 +173 @@
         newData.m_fDisableHostScreenSaver = m_pEditorGlobalDisplayFeatures->disableHostScreenSaver();
     }
+    if (m_pFontScaleEditor)
+        newData.m_iFontScalingFactor = m_pFontScaleEditor->fontScaleFactor();
     m_pCache->cacheCurrentData(newData);
 }
@@ -283 +291 @@
             /* fSuccess = */ gEDataManager->setDisableHostScreenSaver(newData.m_fDisableHostScreenSaver);
 #endif /* VBOX_WS_WIN || VBOX_WS_X11 */
+        /* Save font scale factor: */
+        if (   fSuccess
+            && newData.m_iFontScalingFactor != oldData.m_iFontScalingFactor)
+            /* fSuccess = */ gEDataManager->setFontScaleFactor(newData.m_iFontScalingFactor);
     }
     /* Return result: */