Changeset 71109 in vbox

Timestamp:

Feb 22, 2018 5:00:46 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8694: A bit of improvements for r120971; do not list auto-scaled value if it's equal to 100%; do not add unscaled postfix if auto-scaled postfix is not listed.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp (modified) (1 diff)

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

@@ -2836 +2836 @@
                 {
                     pAction->setProperty("Requested Scale Factor", dScaleFactor);
-                    pAction->setText(QApplication::translate("UIActionPool", "Scale to %1% (unscaled output)", "scale-factor")
-                                     .arg(dScaleFactor * 100));
+                    if (dDevicePixelRatioActual == 1.0)
+                        pAction->setText(QApplication::translate("UIActionPool", "Scale to %1%", "scale-factor")
+                                         .arg(dScaleFactor * 100));
+                    else
+                        pAction->setText(QApplication::translate("UIActionPool", "Scale to %1% (unscaled output)", "scale-factor")
+                                         .arg(dScaleFactor * 100));
                 }
                 /* For the 'autoscaled' action: */
-                else if ((dScaleFactor >= dDevicePixelRatioActual) && !fDevicePixelRatioMentioned)
+                else if (   (dScaleFactor >= dDevicePixelRatioActual)
+                         && (dDevicePixelRatioActual != 1.0)
+                         && !fDevicePixelRatioMentioned)
                 {
                     pAction->setProperty("Requested Scale Factor", dDevicePixelRatioActual);