Changeset 74885 in vbox

Timestamp:

Oct 17, 2018 3:13:30 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9255 Revert the changes that re-ordered some arguments for scale factor related functions

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (4 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• globals/UIActionPoolRuntime.cpp (modified) (2 diffs)
• manager/UIVirtualBoxManager.cpp (modified) (1 diff)
• runtime/UIMachineView.cpp (modified) (3 diffs)
• selector/UISelectorWindow.cpp (modified) (2 diffs)
• settings/global/UIGlobalSettingsDisplay.cpp (modified) (2 diffs)

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

@@ -3984 +3984 @@
 }
 
-double UIExtraDataManager::scaleFactor(const int uScreenIndex, const QUuid &aID /* = GlobalID */)
+double UIExtraDataManager::scaleFactor(const QUuid &aID, const int uScreenIndex)
 {
     /* Get corresponding extra-data for this machine: */
     QStringList data = extraDataStringList(GUI_ScaleFactor, aID);
-
-    /* If that fails check the global scale factor: */
-    if (data.size() == 0)
-        data = extraDataStringList(GUI_ScaleFactor, GlobalID);
 
     /* 1.0 is default scale factor: */
@@ -4009 +4005 @@
 }
 
-QList<double> UIExtraDataManager::scaleFactors(const QUuid &aID /* = GlobalID */)
+QList<double> UIExtraDataManager::scaleFactors(const QUuid &aID)
 {
     /* Look for the scale factor for this machine first: */
     QStringList data = extraDataStringList(GUI_ScaleFactor, aID);
-
-    /* then looks for the global scale factors: */
-    if (data.size() == 0)
-        data = extraDataStringList(GUI_ScaleFactor, GlobalID);
 
     QList<double> scaleFactorList;
@@ -4038 +4030 @@
 }
 
-void UIExtraDataManager::setScaleFactor(double dScaleFactor, const int uScreenIndex, const QUuid &aID /* = GlobalID */)
+void UIExtraDataManager::setScaleFactor(double dScaleFactor, const QUuid &aID, const int uScreenIndex)
 {
     QStringList data = extraDataStringList(GUI_ScaleFactor, aID);
@@ -4055 +4047 @@
 }
 
-void UIExtraDataManager::setScaleFactors(const QList<double> &scaleFactors, const QUuid &aID /* = GlobalID */)
+void UIExtraDataManager::setScaleFactors(const QList<double> &scaleFactors, const QUuid &aID)
 {
     QStringList data;

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

@@ -606 +606 @@
 
         /** Returns the scale-factor. */
-        double scaleFactor(const int uScreenIndex, const QUuid &aID = GlobalID);
-        QList<double> scaleFactors(const QUuid &aID = GlobalID);
+        double scaleFactor(const QUuid &aID, const int uScreenIndex);
+        QList<double> scaleFactors(const QUuid &aID);
         /** Defines the @a dScaleFactor. */
-        void setScaleFactor(double dScaleFactor, const int uScreenIndex, const QUuid &aID = GlobalID);
-        void setScaleFactors(const QList<double> &scaleFactors, const QUuid &aID = GlobalID);
+        void setScaleFactor(double dScaleFactor, const QUuid &aID, const int uScreenIndex);
+        void setScaleFactors(const QList<double> &scaleFactors, const QUuid &aID);
 
         /** Returns the scaling optimization type. */

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

@@ -3157 +3157 @@
     /* Change scale-factor directly: */
     const double dScaleFactor = pAction->property("Requested Scale Factor").toDouble();
-    gEDataManager->setScaleFactor(dScaleFactor, 0, vboxGlobal().managedVMUuid());
+    gEDataManager->setScaleFactor(dScaleFactor, vboxGlobal().managedVMUuid(), 0);
 }
 
@@ -3783 +3783 @@
 
         /* Get current scale-factor: */
-        const double dCurrentScaleFactor = gEDataManager->scaleFactor(0, vboxGlobal().managedVMUuid());
+        const double dCurrentScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid(), 0);
 
         /* Get device-pixel-ratio: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -303 +303 @@
         }
     }
-
+    printf("Aaaaaaaaaaaaaaaaaaaaaaaaaaxxxxaaaaaaaa\n");
     /* Warn the user about inaccessible medium, propose to open MM window/tool: */
     if (fIsThereAnyInaccessibleMedium && msgCenter().warnAboutInaccessibleMedia())

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

@@ -248 +248 @@
 {
     /* Acquire selected scale-factor: */
-    double dScaleFactor = gEDataManager->scaleFactor(m_uScreenId, vboxGlobal().managedVMUuid());
+    double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid(), m_uScreenId);
 
     /* Take the device-pixel-ratio into account: */
@@ -508 +508 @@
 
     /* Acquire selected scale-factor: */
-    double dScaleFactor = gEDataManager->scaleFactor(m_uScreenId, vboxGlobal().managedVMUuid());
+    double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid(), m_uScreenId);
 
     /* Take the device-pixel-ratio into account: */
@@ -702 +702 @@
 
         /* Acquire selected scale-factor: */
-        double dScaleFactor = gEDataManager->scaleFactor(m_uScreenId, vboxGlobal().managedVMUuid());
+        double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid(), m_uScreenId);
 
         /* Take the device-pixel-ratio into account: */

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

@@ -329 +329 @@
 void UISelectorWindow::sltHandleMediumEnumerationFinish()
 {
+    printf("Aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n");
     /* We try to warn about inaccessible media only once
      * (after media emumeration started from main() at startup),
@@ -358 +359 @@
         sltOpenVirtualMediumManagerWindow();
     }
+
 }
 

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

@@ -95 +95 @@
         oldDisplayData.m_maxGuestResolution = gEDataManager->maxGuestResolutionForPolicyFixed();
     oldDisplayData.m_fActivateHoveredMachineWindow = gEDataManager->activateHoveredMachineWindow();
-    oldDisplayData.m_scaleFactors = gEDataManager->scaleFactors();
+    oldDisplayData.m_scaleFactors = gEDataManager->scaleFactors(UIExtraDataManager::GlobalID);
 
     /* Cache old display data: */
@@ -268 +268 @@
         /* Save guest-screen scale-factor: */
         if (fSuccess && newDisplayData.m_scaleFactors != oldDisplayData.m_scaleFactors)
-            gEDataManager->setScaleFactors(newDisplayData.m_scaleFactors);
+            gEDataManager->setScaleFactors(newDisplayData.m_scaleFactors, UIExtraDataManager::GlobalID);
     }
     /* Return result: */