Changeset 49401 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Nov 6, 2013 6:02:27 PM (11 years ago)

Author:

vboxsync

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

90457

Message:

FE/Qt: 7069: Fixing machine-window artifacts on VM boot.

File:

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

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

@@ -219 +219 @@
                                            int iWidth, int iHeight)
 {
+    // TODO: Move to appropriate place!
     /* Some situations require frame-buffer resize-events to be ignored at all,
      * leaving machine-window, machine-view and frame-buffer sizes preserved: */
@@ -224 +225 @@
         return;
 
-    /* If only the pitch has changed (or nothing at all!) we only update the
-     * frame-buffer and don't touch the window.  This prevents unwanted resizes
-     * when entering or exiting fullscreen on X.Org guests and when
-     * re-attaching the frame-buffer on a view switch. */
-    bool fResize =    (ulong)iWidth != frameBuffer()->width()
-                   || (ulong)iHeight != frameBuffer()->height();
-
     /* If machine-window is visible: */
     if (uisession()->isScreenVisible(m_uScreenId))
     {
-        /* Apply current window size to frame-buffer: */
+        // TODO: Move to appropriate place!
+        /* Adjust 'scale' mode for current machine-view size: */
         if (visualStateType() == UIVisualStateType_Scale)
             frameBuffer()->setScaledSize(size());
 
-        /* Compose guest resize-event: */
-        UIResizeEvent resizeEvent(iPixelFormat, pVRAM,
-                                  iBitsPerPixel, iBytesPerLine,
-                                  iWidth, iHeight);
-
-        /* Perform frame-buffer resize if parent window is visible: */
+        /* Is there a proposal for frame-buffer resize? */
+        bool fResizeProposed = (ulong)iWidth != frameBuffer()->width() ||
+                               (ulong)iHeight != frameBuffer()->height();
+
+        /* Perform frame-buffer mode-change: */
+        UIResizeEvent resizeEvent(iPixelFormat, pVRAM, iBitsPerPixel, iBytesPerLine, iWidth, iHeight);
         frameBuffer()->resizeEvent(&resizeEvent);
-    }
-
-    /* If resize actually happens and machine-window is visible: */
-    if (fResize && uisession()->isScreenVisible(m_uScreenId))
-    {
-        /* Scale-mode doesn't need this: */
-        if (visualStateType() != UIVisualStateType_Scale)
-        {
-            /* Reapply maximum size restriction for machine-view: */
-            setMaximumSize(sizeHint());
-
-            /* Disable the resize hint override hack: */
-            m_sizeHintOverride = QSize(-1, -1);
-
-            /* Perform machine-view resize: */
-            resize(iWidth, iHeight);
-        }
-
-        /* Let our toplevel widget calculate its sizeHint properly: */
-        QCoreApplication::sendPostedEvents(0, QEvent::LayoutRequest);
+
+        /* Was framebuffer actually resized? */
+        if (fResizeProposed)
+        {
+            /* Scale-mode doesn't need this.. */
+            if (visualStateType() != UIVisualStateType_Scale)
+            {
+                /* 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 machine-window geometry: */
+                if (visualStateType() == UIVisualStateType_Normal)
+                    machineWindow()->normalizeGeometry(true /* adjust position */);
+            }
 
 #ifdef Q_WS_MAC
-        machineLogic()->updateDockIconSize(screenId(), iWidth, iHeight);
+            /* Update MacOS X dock icon size: */
+            machineLogic()->updateDockIconSize(screenId(), iWidth, iHeight);
 #endif /* Q_WS_MAC */
-
-        /* Scale-mode doesn't need this: */
-        if (visualStateType() != UIVisualStateType_Scale)
-        {
-            /* Update machine-view sliders: */
-            updateSliders();
-
-            /* Normalize machine-window geometry: */
-            if (visualStateType() == UIVisualStateType_Normal)
-                machineWindow()->normalizeGeometry(true /* adjust position */);
         }
     }