Changeset 69702 in vbox

Timestamp:

Nov 15, 2017 12:19:52 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8694: HiDPI support fix for menu-bar & status-bar editors: Set strict scaleable margin instead of default one (s.a. r119037).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMenuBarEditorWindow.cpp (modified) (1 diff)
• UIStatusBarEditorWindow.cpp (modified) (1 diff)

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

@@ -877 +877 @@
         const int iStandardMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 2;
         const int iMinimumMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 4;
-        /* Standard margins should not be too small: */
-        iLeft   = qMax(iLeft,   iStandardMetric);
-        iTop    = qMax(iTop,    iStandardMetric);
-        iRight  = qMax(iRight,  iStandardMetric);
-        iBottom = qMax(iBottom, iStandardMetric);
+        /* Standard margins should not be too small/large: */
+        iLeft   = iStandardMetric;
+        iTop    = iStandardMetric;
+        iRight  = iStandardMetric;
+        iBottom = iStandardMetric;
         /* Top margin should be smaller for the common case: */
         if (iTop >= iMinimumMetric)

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

@@ -496 +496 @@
         const int iStandardMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 2;
         const int iMinimumMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) / 4;
-        /* Standard margins should not be too small: */
-        iLeft   = qMax(iLeft,   iStandardMetric);
-        iTop    = qMax(iTop,    iStandardMetric);
-        iRight  = qMax(iRight,  iStandardMetric);
-        iBottom = qMax(iBottom, iStandardMetric);
+        /* Standard margins should not be too small/large: */
+        iLeft   = iStandardMetric;
+        iTop    = iStandardMetric;
+        iRight  = iStandardMetric;
+        iBottom = iStandardMetric;
         /* Bottom margin should be smaller for the common case: */
         if (iBottom >= iMinimumMetric)