Changeset 101071 in vbox

Timestamp:

Sep 8, 2023 2:59:59 PM (15 months ago)

Author:

vboxsync

Message:

FE/Qt: Global Preferences / Display page: Reorder Font Scaling editor with Display Features editor.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/global

Files:

• UIGlobalSettingsDisplay.cpp (modified) (13 diffs)
• UIGlobalSettingsDisplay.h (modified) (1 diff)

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

@@ -54 +54 @@
                && (m_guiMaximumGuestScreenSizeValue == other.m_guiMaximumGuestScreenSizeValue)
                && (m_scaleFactors == other.m_scaleFactors)
+               && (m_iFontScalingFactor == other.m_iFontScalingFactor)
                && (m_fActivateHoveredMachineWindow == other.m_fActivateHoveredMachineWindow)
                && (m_fDisableHostScreenSaver == other.m_fDisableHostScreenSaver)
-               && (m_iFontScalingFactor == other.m_iFontScalingFactor)
                   ;
     }
@@ -69 +69 @@
     /** Holds the guest screen scale-factor. */
     QList<double>                  m_scaleFactors;
+    /** Holds the font scaling factor. */
+    int                            m_iFontScalingFactor;
     /** Holds whether we should automatically activate machine window under the mouse cursor. */
     bool                           m_fActivateHoveredMachineWindow;
     /** Holds whether we should disable host sceen saver on a vm is running. */
     bool                           m_fDisableHostScreenSaver;
-    /** Holds font scaling factor. */
-    int                            m_iFontScalingFactor;
 };
 
@@ -86 +86 @@
     , m_pEditorMaximumGuestScreenSize(0)
     , m_pEditorScaleFactor(0)
+    , m_pFontScaleEditor(0)
     , m_pEditorDisplayFeatures(0)
-    , m_pFontScaleEditor(0)
 {
     prepare();
@@ -119 +119 @@
                                                                              gEDataManager->maxGuestResolutionForPolicyFixed());
     oldData.m_scaleFactors = gEDataManager->scaleFactors(UIExtraDataManager::GlobalID);
+    oldData.m_iFontScalingFactor = gEDataManager->fontScaleFactor();
     oldData.m_fActivateHoveredMachineWindow = gEDataManager->activateHoveredMachineWindow();
 #if defined(VBOX_WS_WIN) || defined(VBOX_WS_NIX)
     oldData.m_fDisableHostScreenSaver = gEDataManager->disableHostScreenSaver();
 #endif
-    oldData.m_iFontScalingFactor = gEDataManager->fontScaleFactor();
     m_pCache->cacheInitialData(oldData);
 
@@ -145 +145 @@
         m_pEditorScaleFactor->setMonitorCount(UIDesktopWidgetWatchdog::screenCount());
     }
+    if (m_pFontScaleEditor)
+        m_pFontScaleEditor->setFontScaleFactor(oldData.m_iFontScalingFactor);
     if (m_pEditorDisplayFeatures)
     {
@@ -150 +152 @@
         m_pEditorDisplayFeatures->setDisableHostScreenSaver(oldData.m_fDisableHostScreenSaver);
     }
-    if (m_pFontScaleEditor)
-        m_pFontScaleEditor->setFontScaleFactor(oldData.m_iFontScalingFactor);
 }
 
@@ -168 +168 @@
     if (m_pEditorScaleFactor)
         newData.m_scaleFactors = m_pEditorScaleFactor->scaleFactors();
+    if (m_pFontScaleEditor)
+        newData.m_iFontScalingFactor = m_pFontScaleEditor->fontScaleFactor();
     if (m_pEditorDisplayFeatures)
     {
@@ -173 +175 @@
         newData.m_fDisableHostScreenSaver = m_pEditorDisplayFeatures->disableHostScreenSaver();
     }
-    if (m_pFontScaleEditor)
-        newData.m_iFontScalingFactor = m_pFontScaleEditor->fontScaleFactor();
     m_pCache->cacheCurrentData(newData);
 }
@@ -196 +196 @@
     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorMaximumGuestScreenSize->minimumLabelHorizontalHint());
     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorScaleFactor->minimumLabelHorizontalHint());
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pFontScaleEditor->minimumLabelHorizontalHint());
     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorDisplayFeatures->minimumLabelHorizontalHint());
-    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pFontScaleEditor->minimumLabelHorizontalHint());
     m_pEditorMaximumGuestScreenSize->setMinimumLayoutIndent(iMinimumLayoutHint);
     m_pEditorScaleFactor->setMinimumLayoutIndent(iMinimumLayoutHint);
+    m_pFontScaleEditor->setMinimumLayoutIndent(iMinimumLayoutHint);
     m_pEditorDisplayFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
-    m_pFontScaleEditor->setMinimumLayoutIndent(iMinimumLayoutHint);
 }
 
@@ -239 +239 @@
         }
 
+        /* Prepare 'font scale' editor: */
+        m_pFontScaleEditor = new UIFontScaleEditor(this);
+        if (m_pFontScaleEditor)
+        {
+            m_editors << m_pFontScaleEditor;
+            pLayout->addWidget(m_pFontScaleEditor);
+        }
+
         /* Prepare 'display features' editor: */
         m_pEditorDisplayFeatures = new UIDisplayFeaturesEditor(this);
@@ -247 +255 @@
         }
 
-        /* Prepare 'font scale' editor: */
-        m_pFontScaleEditor = new UIFontScaleEditor(this);
-        if (m_pFontScaleEditor)
-        {
-            m_editors << m_pFontScaleEditor;
-            pLayout->addWidget(m_pFontScaleEditor);
-        }
-
         /* Add stretch to the end: */
         pLayout->addStretch();
@@ -293 +293 @@
             && newData.m_scaleFactors != oldData.m_scaleFactors)
             /* fSuccess = */ gEDataManager->setScaleFactors(newData.m_scaleFactors, UIExtraDataManager::GlobalID);
+        /* Save font scale factor: */
+        if (   fSuccess
+            && newData.m_iFontScalingFactor != oldData.m_iFontScalingFactor)
+            /* fSuccess = */ gEDataManager->setFontScaleFactor(newData.m_iFontScalingFactor);
         /* Save whether hovered machine-window should be activated automatically: */
         if (   fSuccess
@@ -303 +307 @@
             /* fSuccess = */ gEDataManager->setDisableHostScreenSaver(newData.m_fDisableHostScreenSaver);
 #endif /* VBOX_WS_WIN || VBOX_WS_NIX */
-        /* Save font scale factor: */
-        if (   fSuccess
-            && newData.m_iFontScalingFactor != oldData.m_iFontScalingFactor)
-            /* fSuccess = */ gEDataManager->setFontScaleFactor(newData.m_iFontScalingFactor);
     }
     /* Return result: */

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

@@ -98 +98 @@
         /** Holds the 'scale-factor' editor instance. */
         UIScaleFactorEditor            *m_pEditorScaleFactor;
+        /** Holds the 'font scale' editor instance. */
+        UIFontScaleEditor              *m_pFontScaleEditor;
         /** Holds the 'display features' editor instance. */
         UIDisplayFeaturesEditor        *m_pEditorDisplayFeatures;
-        /** Holds the 'font scale' editor instance. */
-        UIFontScaleEditor              *m_pFontScaleEditor;
     /** @} */
 };