Changeset 53898 in vbox

Timestamp:

Jan 21, 2015 12:32:22 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

97747

Message:

FE/Qt: 3635: Scaling mode support: Do not apply normal scale-factor to scaled-mode.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (3 diffs)

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

@@ -479 +479 @@
     }
     /* Tune according scale-factor: */
-    if (m_dScaleFactor != 1.0 || backingScaleFactor() > 1.0)
+    if (scaleFactor() != 1.0 || backingScaleFactor() > 1.0)
         region = m_transform.map(region);
 
@@ -696 +696 @@
     unlock();
 
-    /* Update scaled-size according scale-factor: */
-    setScaledSize(scaleFactor() == 1.0 ? scaledSize() : QSize(m_iWidth * scaleFactor(), m_iHeight * scaleFactor()));
+    /* Update scaled-size according scale-factor for modes except the 'Scale' one: */
+    if (m_pMachineView->machineLogic()->visualStateType() != UIVisualStateType_Scale)
+        setScaledSize(scaleFactor() == 1.0 ? QSize() : QSize(m_iWidth * scaleFactor(), m_iHeight * scaleFactor()));
 }
 
@@ -835 +836 @@
 
     /* Apply the scale-factor if necessary: */
-    if (m_dScaleFactor != 1.0)
-        m_transform = m_transform.scale(m_dScaleFactor, m_dScaleFactor);
+    if (scaleFactor() != 1.0)
+        m_transform = m_transform.scale(scaleFactor(), scaleFactor());
 
     /* Apply the backing-scale-factor if necessary: */