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

Timestamp:

Oct 26, 2022 4:55:35 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10313 Some more fixes and additions.

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) (1 diff)
• globals/UICommon.cpp (modified) (4 diffs)
• globals/UICommon.h (modified) (3 diffs)
• settings/editors/UIFontScaleEditor.cpp (modified) (2 diffs)

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

@@ -267 +267 @@
 
 const char *UIExtraDataDefs::GUI_MediumSelector_DialogGeometry = "GUI/MediumSelector/DialogGeometry";
+
+const int UIExtraDataDefs::iFontScaleMin = 50;
+const int UIExtraDataDefs::iFontScaleMax = 150;
 
 /* Obsolete keys: */

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

@@ -489 +489 @@
         SHARED_LIBRARY_STUFF extern QMultiMap<QString, QString> g_mapOfObsoleteKeys;
     /** @} */
+
+    /** @name Font scaling factor min-max.
+      * @{ */
+        extern const int iFontScaleMin;
+        extern const int iFontScaleMax;
+    /** @} */
 }
 

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

@@ -2612 +2612 @@
 void UIExtraDataManager::setFontScaleFactor(int iFontScaleFactor)
 {
-    int iMax = 200;
-    int iMin = 40;
-    if (iFontScaleFactor < iMin || iFontScaleFactor > iMax)
+    if (iFontScaleFactor < UIExtraDataDefs::iFontScaleMin || iFontScaleFactor > UIExtraDataDefs::iFontScaleMax)
         return;
     setExtraDataString(GUI_FontScaleFactor, QString::number(iFontScaleFactor));
@@ -2624 +2622 @@
     bool fConversion = false;
     int iScaleFactor = strFontScaleFactor.toInt(&fConversion);
-    int iMax = 200;
-    int iMin = 40;
-    if (!fConversion || iScaleFactor < iMin || iScaleFactor > iMax)
+    if (!fConversion || iScaleFactor < UIExtraDataDefs::iFontScaleMin || iScaleFactor > UIExtraDataDefs::iFontScaleMax)
         return 100;
     return iScaleFactor;
@@ -4847 +4843 @@
                     emit sigDetailsOptionsChange(enmType);
             }
+            /* Font scaling factor has changed: */
+            else if (strKey == GUI_FontScaleFactor)
+                emit sigFontScaleFactorChanged(fontScaleFactor());
         }
     }

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

@@ -121 +121 @@
     void sigScalingOptimizationTypeChange(const QUuid &uMachineID);
 
+    /** Notifies about font scale factor. */
+    void sigFontScaleFactorChanged(int iFontScaleFactor);
+
 #ifdef VBOX_WS_MAC
     /** Notifies about the HiDPI optimization type change. */

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

@@ -63 +63 @@
 #include "UIConverter.h"
 #include "UIDesktopWidgetWatchdog.h"
+#include "UIExtraDataDefs.h"
 #include "UIExtraDataManager.h"
 #include "UIFDCreationDialog.h"
@@ -321 +322 @@
     connect(gEDataManager, &UIExtraDataManager::sigLanguageChange,
             this, &UICommon::sltGUILanguageChange);
+    connect(gEDataManager, &UIExtraDataManager::sigFontScaleFactorChanged,
+            this, &UICommon::sltHandleFontScaleFactorChanged);
 
     qApp->installEventFilter(this);
@@ -731 +734 @@
 #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);
+
+    iOriginalFontPixelSize = qApp->font().pixelSize();
+    iOriginalFontPointSize = qApp->font().pointSize();
+    sltHandleFontScaleFactorChanged(gEDataManager->fontScaleFactor());
 }
 
@@ -2722 +2718 @@
 }
 
+
+void UICommon::sltHandleFontScaleFactorChanged(int iFontScaleFactor)
+{
+    QFont appFont = qApp->font();
+
+    if (iOriginalFontPixelSize != -1)
+        appFont.setPixelSize(iFontScaleFactor / 100.f * iOriginalFontPixelSize);
+    else
+        appFont.setPointSize(iFontScaleFactor / 100.f * iOriginalFontPointSize);
+    qApp->setFont(appFont);
+}
+
 void UICommon::retranslateUi()
 {

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:
 
@@ -590 +587 @@
         void sltHandleVBoxSVCAvailabilityChange(bool fAvailable);
     /** @} */
+
+    /* Handle font scale factor change. */
+    void sltHandleFontScaleFactorChanged(int iFontScaleFactor);
 
 private:
@@ -782 +782 @@
     /** @} */
 #endif
+    /** @name Font scaling related variables.
+     * @{ */
+       int iOriginalFontPixelSize;
+       int iOriginalFontPointSize;
+    /** @} */
 
     /** Allows for shortcut access. */

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

@@ -36 +36 @@
 #include "QIAdvancedSlider.h"
 #include "UIDesktopWidgetWatchdog.h"
+#include "UIExtraDataDefs.h"
 #include "UIFontScaleEditor.h"
 
@@ -176 +177 @@
     m_pScaleSlider->blockSignals(true);
     m_pScaleSpinBox->blockSignals(true);
-    const int iMinimum = 40;
-    const int iMaximum = 200;
-
-    const int iStep = 25;
+    const int iMinimum = UIExtraDataDefs::iFontScaleMin;
+    const int iMaximum = UIExtraDataDefs::iFontScaleMax;
 
     m_pScaleSlider->setMinimum(iMinimum);
     m_pScaleSlider->setMaximum(iMaximum);
-    m_pScaleSlider->setPageStep(iStep);
-    m_pScaleSlider->setSingleStep(1);
-    m_pScaleSlider->setTickInterval(iStep);
+    m_pScaleSlider->setPageStep(20);
+    m_pScaleSlider->setSingleStep(10);
+    m_pScaleSlider->setTickInterval(20);
+    m_pScaleSpinBox->setSingleStep(10);
     m_pScaleSpinBox->setMinimum(iMinimum);
     m_pScaleSpinBox->setMaximum(iMaximum);