Changeset 2221 in vbox for trunk

Timestamp:

Apr 19, 2007 12:50:09 PM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Rolled back changeset:20385 because the resize deadlocks have been eliminated now.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleView.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h

@@ -203 +203 @@
     bool ignore_mainwnd_resize : 1;
     bool autoresize_guest : 1;
-    QSize autoresize_guest_hint;
 
     bool mfNumLock : 1;

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

@@ -823 +823 @@
                 /* report to the VM thread that we finished resizing */
                 cconsole.GetDisplay().ResizeCompleted();
-
-                /* reset the last auto-resize hint to confirm the guest has
-                 * accepted it (which may not always be the case if a
-                 * "natural" guest resize occasionally happened right after
-                 * we've sent a resize hint) */
-                autoresize_guest_hint = QSize();
 
                 ignore_mainwnd_resize = false;
@@ -2805 +2799 @@
     if (autoresize_guest)
     {
-        if (!autoresize_guest_hint.isValid())
-        {
-            /* Get the available size for the guest display.  We assume here
-             * that the centralWidget() contains this view only and gives it
-             * all available space. */
-            QSize sz (mainwnd->centralWidget()->size());
-            sz -= QSize (frameWidth() * 2, frameWidth() * 2);
-            LogFlowFunc (("Will suggest (%d,%d)\n", sz.width(), sz.height()));
-
-            autoresize_guest_hint = sz;
-            cconsole.GetDisplay().SetVideoModeHint (sz.width(), sz.height(), 0);
-        }
-        else
-        {
-            /* A previous resize hint has not been served yet (at least we
-             * didn't get ResizeEvent from the guest). */
-            LogFlowFunc (("Guest is ignoring our last resize hint (%d,%d), "
-                          "don't suggest any more.\n",
-                          autoresize_guest_hint.width(),
-                          autoresize_guest_hint.height()));
-        }
-    }
-}
-
+        /* Get the available size for the guest display.
+         * We assume here that the centralWidget() contains this view only
+         * and gives it all available space. */
+        QSize sz (mainwnd->centralWidget()->size());
+        sz -= QSize (frameWidth() * 2, frameWidth() * 2);
+        LogFlowFunc (("Will suggest %d,%d\n", sz.width(), sz.height()));
+
+        cconsole.GetDisplay().SetVideoModeHint (sz.width(), sz.height(), 0);
+    }
+}
+