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

Timestamp:

Mar 20, 2015 11:56:11 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7115: Adjust machine-window on NotifyChange only if the frame-buffer size really changed.

File:

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

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

@@ -246 +246 @@
     if (uisession()->isScreenVisible(m_uScreenId))
     {
-        /* Check if that notify-change brings actual resize-event: */
-        const bool fActualResize = frameBuffer()->width() != (ulong)iWidth ||
-                                   frameBuffer()->height() != (ulong)iHeight;
+        /* Get old frame-buffer size: */
+        const QSize frameBufferSizeOld = QSize(frameBuffer()->width(),
+                                               frameBuffer()->height());
 
         /* Perform frame-buffer mode-change: */
         frameBuffer()->handleNotifyChange(iWidth, iHeight);
+
+        /* Get new frame-buffer size: */
+        const QSize frameBufferSizeNew = QSize(frameBuffer()->width(),
+                                               frameBuffer()->height());
 
         /* For 'scale' mode: */
@@ -279 +283 @@
 
             /* Normalize 'normal' machine-window geometry if necessary: */
-            if (visualStateType() == UIVisualStateType_Normal && fActualResize)
+            if (visualStateType() == UIVisualStateType_Normal &&
+                frameBufferSizeNew != frameBufferSizeOld)
                 machineWindow()->normalizeGeometry(true /* adjust position */);
         }