Changeset 53388 in vbox for trunk

Timestamp:

Nov 24, 2014 2:49:24 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 6278: Support for scaled video-output: Forgot to update scroll-bars in r96997; Small cleanup.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (modified) (6 diffs)

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

@@ -186 +186 @@
 
     /* Take the scale-factor into account: */
-    const double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
-    newSize /= dScaleFactor;
+    newSize /= gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
 
     /* Expand current limitations: */
@@ -219 +218 @@
     {
         /* Check if that notify-change brings actual resize-event: */
-        const bool fActualResize = frameBuffer()->width() != iWidth ||
-                                   frameBuffer()->height() != iHeight;
+        const bool fActualResize = frameBuffer()->width() != (ulong)iWidth ||
+                                   frameBuffer()->height() != (ulong)iHeight;
 
         /* Adjust 'scale' mode to current machine-view size: */
@@ -648 +647 @@
 
     /* Take the scale-factor into account: */
-    const double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
-    size *= dScaleFactor;
+    size *= gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -732 +730 @@
 
     /* Take the scale-factor into account: */
-    const double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
-    size *= dScaleFactor;
+    size *= gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
 
     /* Return size: */
@@ -839 +836 @@
 
     QSize v = QSize(frameBuffer()->width(), frameBuffer()->height());
+
+    /* Take the scale-factor into account: */
+    v *= gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
+
     /* No scroll bars needed: */
     if (m.expandedTo(v) == m)
@@ -1070 +1071 @@
         QPainter painter(viewport());
         /* Take the scale-factor into account: */
-        const double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
-        if (dScaleFactor == 1)
+        if (gEDataManager->scaleFactor(vboxGlobal().managedVMUuid()) == 1)
             painter.drawPixmap(rect, pausePixmap(), QRect(rect.x() + contentsX(), rect.y() + contentsY(),
                                                           rect.width(), rect.height()));