Changeset 26567 in vbox for trunk/src/VBox

Timestamp:

Feb 16, 2010 11:23:41 AM (15 years ago)

Author:

vboxsync

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

57749

Message:

seamless: fix regression #4638

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxConsoleView.cpp (modified) (2 diffs)
• VBoxConsoleWnd.cpp (modified) (1 diff)
• VBoxConsoleWnd.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -1273 +1273 @@
 #endif
 
+                bool notifyManiWnd = mStoredConsoleSize.width() != re->width()
+                                || mStoredConsoleSize.height() != re->height();
+
+
                 /* Store the new size to prevent unwanted resize hints being
                  * sent back. */
@@ -1359 +1363 @@
                 }
 
-                mMainWnd->onDisplayResize (re->width(), re->height());
+                if (notifyManiWnd)
+                        mMainWnd->onDisplayResize (re->width(), re->height());
 
                 return true;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -1235 +1235 @@
 }
 
-void VBoxConsoleWnd::onDisplayResize (ulong aHeight, ulong aWidth)
-{
-    if (mIsSeamless && QApplication::desktop()->availableGeometry (this).size() != QSize (aHeight, aWidth))
-    {
-        mVmSeamlessAction->setChecked (false);
-        /* should be cleared already, but just in case */
-        if (mIsSeamless)
-            toggleFullscreenMode (false, true);
+void VBoxConsoleWnd::onDisplayResize (ulong aWidth, ulong aHeight)
+{
+    if (mIsSeamless)
+    {
+        const QRect & geo = QApplication::desktop()->availableGeometry (this);
+        int dW = geo.width() - (int)aWidth;
+        int dH = geo.height() - (int)aHeight;
+        if (RT_ABS (dW) > 16 || RT_ABS (dH) > 16)
+        {
+                        mVmSeamlessAction->setChecked (false);
+                        /* should be cleared already, but just in case */
+                        if (mIsSeamless)
+                                toggleFullscreenMode (false, true);
+        }
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.h

@@ -113 +113 @@
 
     /* informs that the guest display is resized */
-    void onDisplayResize (ulong aHeight, ulong aWidth);
+    void onDisplayResize (ulong aWidth, ulong aHeight);
 
 #ifdef VBOX_WITH_VIDEOHWACCEL