Changeset 38957 in vbox for trunk/src

Timestamp:

Oct 6, 2011 12:49:05 PM (13 years ago)

Author:

vboxsync

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

74328

Message:

FE/Qt: remove should-we-resize heuristics which are no longer needed

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineView.cpp (modified) (2 diffs)
• UIMachineView.h (modified) (1 diff)
• fullscreen/UIMachineViewFullscreen.cpp (modified) (1 diff)
• normal/UIMachineViewNormal.cpp (modified) (1 diff)
• seamless/UIMachineViewSeamless.cpp (modified) (1 diff)

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

@@ -158 +158 @@
     AssertMsg(newSize.isValid(), ("Size should be valid!\n"));
 
-    /* Do not send the same hints as we already have: */
-    if ((newSize.width() == storedConsoleSize().width()) && (newSize.height() == storedConsoleSize().height()))
-        return;
-
-    /* We only actually send the hint if either an explicit new size was given
-     * (e.g. if the request was triggered directly by a console resize event) or
-     * if no explicit size was specified but a resize is flagged as being needed
-     * (e.g. the autoresize was just enabled and the console was resized while it was disabled). */
-    if (toSize.isValid() || m_fShouldWeDoResize)
-    {
-        /* Remember the new size: */
-        storeConsoleSize(newSize.width(), newSize.height());
-
-        /* Send new size-hint to the guest: */
-        session().GetConsole().GetDisplay().SetVideoModeHint(newSize.width(), newSize.height(), 0, screenId());
-    }
-
-    /* We had requested resize now, rejecting other accident requests: */
-    m_fShouldWeDoResize = false;
+    /* Remember the new size: */
+    storeConsoleSize(newSize.width(), newSize.height());
+
+    /* Send new size-hint to the guest: */
+    session().GetConsole().GetDisplay().SetVideoModeHint(newSize.width(), newSize.height(), 0, screenId());
 }
 
@@ -248 +234 @@
     , m_previousState(KMachineState_Null)
     , m_desktopGeometryType(DesktopGeo_Invalid)
-    , m_fShouldWeDoResize(false)
 #ifdef VBOX_WITH_VIDEOHWACCEL
     , m_fAccelerate2DVideo(bAccelerate2DVideo)

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

@@ -177 +177 @@
     QSize m_storedConsoleSize;
 
-    bool m_fShouldWeDoResize : 1;
 #ifdef VBOX_WITH_VIDEOHWACCEL
     bool m_fAccelerate2DVideo : 1;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp

@@ -187 +187 @@
                     break;
 
-                /* Set the "guest needs to resize" hint.
-                 * This hint is acted upon when (and only when) the autoresize property is "true": */
-                m_fShouldWeDoResize = uisession()->isGuestSupportsGraphics();
-                if (m_bIsGuestAutoresizeEnabled && m_fShouldWeDoResize)
+                if (m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
                     QTimer::singleShot(0, this, SLOT(sltPerformGuestResize()));
                 break;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp

@@ -174 +174 @@
             case QEvent::Resize:
             {
-                /* Set the "guest needs to resize" hint.
-                 * This hint is acted upon when (and only when) the autoresize property is "true": */
-                m_fShouldWeDoResize = uisession()->isGuestSupportsGraphics();
                 if (pEvent->spontaneous() && m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
                     QTimer::singleShot(300, this, SLOT(sltPerformGuestResize()));

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp

@@ -195 +195 @@
                     break;
 
-                /* Set the "guest needs to resize" hint. */
-                m_fShouldWeDoResize = uisession()->isGuestSupportsGraphics();
-                if (m_fShouldWeDoResize)
+                if (uisession()->isGuestSupportsGraphics())
                     QTimer::singleShot(0, this, SLOT(sltPerformGuestResize()));
                 break;