Changeset 54104 in vbox for trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

Timestamp:

Feb 6, 2015 6:49:01 PM (10 years ago)

Author:

vboxsync

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

98075

Message:

FE/Qt: Runtime UI: UIFrameBuffer refactoring for 6278 and 3635 (step 2): Separate performRescale interface to handle scaling stuff.

File:

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

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

@@ -183 +183 @@
     const bool fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid());
     frameBuffer()->setUseUnscaledHiDPIOutput(fUseUnscaledHiDPIOutput);
+
+    /* Perform frame-buffer rescaling: */
+    frameBuffer()->performRescale();
 }
 
@@ -234 +237 @@
                                    frameBuffer()->height() != (ulong)iHeight;
 
-        /* Adjust 'scale' mode to current machine-view size: */
+        /* Perform frame-buffer mode-change: */
+        frameBuffer()->handleNotifyChange(iWidth, iHeight);
+
+        /* For 'scale' mode: */
         if (visualStateType() == UIVisualStateType_Scale)
         {
@@ -240 +246 @@
             frameBuffer()->setScaledSize(size());
         }
-
-        /* Perform frame-buffer mode-change: */
-        frameBuffer()->handleNotifyChange(iWidth, iHeight);
-
-        /* Scale-mode doesn't need this.. */
-        if (visualStateType() != UIVisualStateType_Scale)
+        /* For other than 'scale' mode: */
+        else
         {
             /* Adjust maximum-size restriction for machine-view: */
@@ -267 +269 @@
                 machineWindow()->normalizeGeometry(true /* adjust position */);
         }
+
+        /* Perform frame-buffer rescaling: */
+        frameBuffer()->performRescale();
 
 #ifdef Q_WS_MAC
@@ -362 +367 @@
                                       (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER));
 
-    /* Adjust frame-buffer, machine-window and guest-screen size if necessary: */
-    sltHandleNotifyChange(frameBuffer()->width(), frameBuffer()->height());
-    frameBuffer()->performResize(frameBuffer()->width(), frameBuffer()->height());
-    machineWindow()->normalizeGeometry(true /* adjust position */);
+    /* Handle scale attributes change: */
+    handleScaleChange();
+    /* Adjust guest-screen size: */
     adjustGuestScreenSize();
 
@@ -383 +387 @@
     frameBuffer()->setUseUnscaledHiDPIOutput(fUseUnscaledHiDPIOutput);
 
-    /* Adjust frame-buffer, machine-window and guest-screen size if necessary: */
-    sltHandleNotifyChange(frameBuffer()->width(), frameBuffer()->height());
-    frameBuffer()->performResize(frameBuffer()->width(), frameBuffer()->height());
-    machineWindow()->normalizeGeometry(true /* adjust position */);
+    /* Handle scale attributes change: */
+    handleScaleChange();
+    /* Adjust guest-screen size: */
     adjustGuestScreenSize();
 
@@ -558 +561 @@
         m_pFrameBuffer->setUseUnscaledHiDPIOutput(fUseUnscaledHiDPIOutput);
 
+        /* Perform frame-buffer rescaling: */
+        m_pFrameBuffer->performRescale();
+
         /* Associate uisession with frame-buffer finally: */
         uisession()->setFrameBuffer(screenId(), m_pFrameBuffer);
@@ -598 +604 @@
         }
 
-        /* If we have a valid size, resize the framebuffer. */
+        /* If we have a valid size, resize/rescale the frame-buffer. */
         if (size.width() > 0 && size.height() > 0)
+        {
             frameBuffer()->performResize(size.width(), size.height());
+            frameBuffer()->performRescale();
+        }
     }
 }
@@ -844 +853 @@
     /* Return size: */
     return size;
+}
+
+void UIMachineView::handleScaleChange()
+{
+    LogRel(("UIMachineView::handleScaleChange: Screen=%d.\n",
+            (unsigned long)m_uScreenId));
+
+    /* If machine-window is visible: */
+    if (uisession()->isScreenVisible(m_uScreenId))
+    {
+        /* For 'scale' mode: */
+        if (visualStateType() == UIVisualStateType_Scale)
+        {
+            /* Assign new frame-buffer logical-size: */
+            frameBuffer()->setScaledSize(size());
+        }
+        /* For other than 'scale' mode: */
+        else
+        {
+            /* Adjust maximum-size restriction for machine-view: */
+            setMaximumSize(sizeHint());
+
+            /* Disable the resize hint override hack: */
+            m_sizeHintOverride = QSize(-1, -1);
+
+            /* Force machine-window update own layout: */
+            QCoreApplication::sendPostedEvents(0, QEvent::LayoutRequest);
+
+            /* Update machine-view sliders: */
+            updateSliders();
+
+            /* By some reason Win host forgets to update machine-window central-widget
+             * after main-layout was updated, let's do it for all the hosts: */
+            machineWindow()->centralWidget()->update();
+
+            /* Normalize 'normal' machine-window geometry: */
+            if (visualStateType() == UIVisualStateType_Normal)
+                machineWindow()->normalizeGeometry(true /* adjust position */);
+        }
+
+        /* Perform frame-buffer rescaling: */
+        frameBuffer()->performRescale();
+    }
+
+    LogRelFlow(("UIMachineView::handleScaleChange: Complete for Screen=%d.\n",
+                (unsigned long)m_uScreenId));
 }
 
@@ -1233 +1288 @@
             case QEvent::Move:
             {
-                /* Update backing-scale-factor for underlying frame-buffer: */
                 if (m_pFrameBuffer)
+                {
+                    /* Update backing-scale-factor for underlying frame-buffer: */
                     m_pFrameBuffer->setBackingScaleFactor(darwinBackingScaleFactor(machineWindow()));
+                    /* Perform frame-buffer rescaling: */
+                    m_pFrameBuffer->performRescale();
+                }
                 break;
             }