Changeset 53443 in vbox for trunk/src

Timestamp:

Dec 4, 2014 2:41:55 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 6278: Support for scaled video-output: Common viewport update rules for scaled and unscaled cases.

File:

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

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

@@ -281 +281 @@
 void UIMachineView::sltHandleNotifyUpdate(int iX, int iY, int iWidth, int iHeight)
 {
+    /* Prepare corresponding viewport part: */
+    QRect rect;
+
     /* Take the scale-factor into account: */
     const double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
     if (dScaleFactor == 1)
     {
-        /* Just update corresponding viewport part: */
-        viewport()->update(iX - contentsX(), iY - contentsY(), iWidth, iHeight);
+        /* Adjust corresponding viewport part: */
+        rect.moveTo(iX - contentsX(),
+                    iY - contentsY());
+        rect.setSize(QSize(iWidth,
+                           iHeight));
     }
     else
     {
-        /* Calculate corresponding viewport part: */
-        QRect rect(iX * dScaleFactor - 1 - contentsX(),
-                   iY * dScaleFactor - 1 - contentsY(),
-                   iWidth  * dScaleFactor + 2 * dScaleFactor + 1,
-                   iHeight * dScaleFactor + 2 * dScaleFactor + 1);
-        /* Limit the resulting part by the viewport rectangle: */
-        rect &= viewport()->rect();
-        /* Update corresponding viewport part: */
-        viewport()->update(rect);
-    }
+        /* Adjust corresponding viewport part: */
+        rect.moveTo(iX * dScaleFactor - 1 - contentsX(),
+                    iY * dScaleFactor - 1 - contentsY());
+        rect.setSize(QSize(iWidth  * dScaleFactor + 2 * dScaleFactor + 1,
+                           iHeight * dScaleFactor + 2 * dScaleFactor + 1));
+    }
+
+    /* Limit the resulting part by the viewport rectangle: */
+    rect &= viewport()->rect();
+
+    /* Update corresponding viewport part: */
+    viewport()->update(rect);
 }