Changeset 57140 in vbox

Timestamp:

Jul 31, 2015 12:11:27 PM (10 years ago)

Author:

vboxsync

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

101882

Message:

FE/Qt: 3635: Scaling-feature caused regression for scaling-mode using common way to determine scaling transformation type; Ways should be independent.

File:

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

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

@@ -294 +294 @@
 
     /** Returns the transformation mode corresponding to the passed @a dScaleFactor and ScalingOptimizationType. */
-    static Qt::TransformationMode transformationMode(double dScaleFactor, ScalingOptimizationType type);
+    static Qt::TransformationMode transformationMode(ScalingOptimizationType type, double dScaleFactor = 0);
 
     /** Erases corresponding @a rect with @a painter. */
@@ -1347 +1347 @@
         scaledImage = m_image.copy();
         /* And scaling the image to predefined scaled-factor: */
-        scaledImage = scaledImage.scaled(m_scaledSize, Qt::IgnoreAspectRatio,
-                                         transformationMode(m_dScaleFactor, scalingOptimizationType()));
+        switch (m_pMachineView->visualStateType())
+        {
+            case UIVisualStateType_Scale:
+                scaledImage = scaledImage.scaled(m_scaledSize, Qt::IgnoreAspectRatio,
+                                                 transformationMode(scalingOptimizationType()));
+                break;
+            default:
+                scaledImage = scaledImage.scaled(m_scaledSize, Qt::IgnoreAspectRatio,
+                                                 transformationMode(scalingOptimizationType(), m_dScaleFactor));
+                break;
+        }
     }
     /* Finally we are choosing image to paint from: */
@@ -1388 +1397 @@
         scaledImage = m_image.copy();
         /* And scaling the image to predefined scaled-factor: */
-        scaledImage = scaledImage.scaled(m_scaledSize, Qt::IgnoreAspectRatio,
-                                         transformationMode(m_dScaleFactor, scalingOptimizationType()));
+        switch (m_pMachineView->visualStateType())
+        {
+            case UIVisualStateType_Scale:
+                scaledImage = scaledImage.scaled(m_scaledSize, Qt::IgnoreAspectRatio,
+                                                 transformationMode(scalingOptimizationType()));
+                break;
+            default:
+                scaledImage = scaledImage.scaled(m_scaledSize, Qt::IgnoreAspectRatio,
+                                                 transformationMode(scalingOptimizationType(), m_dScaleFactor));
+                break;
+        }
     }
     /* Finally we are choosing image to paint from: */
@@ -1445 +1463 @@
 
 /* static */
-Qt::TransformationMode UIFrameBufferPrivate::transformationMode(double dScaleFactor, ScalingOptimizationType type)
+Qt::TransformationMode UIFrameBufferPrivate::transformationMode(ScalingOptimizationType type, double dScaleFactor /* = 0 */)
 {
     switch (type)
@@ -1454 +1472 @@
     }
     /* For integer-scaling we are choosing the 'Performance' optimization type ourselves: */
-    return floor(dScaleFactor) == dScaleFactor ? Qt::FastTransformation : Qt::SmoothTransformation;
+    return dScaleFactor && floor(dScaleFactor) == dScaleFactor ? Qt::FastTransformation : Qt::SmoothTransformation;;
 }