Changeset 49306 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 28, 2013 12:46:49 PM (12 years ago)

Author:

vboxsync

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

90268

Message:

FE/Qt: Runtime UI: Make sure automatically enabled guest screen receive proper size hint as soon as possible (even if it have valid size already it can have pending invalid hint).

Location:

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

Files:

• UIFrameBuffer.cpp (modified) (2 diffs)
• UIFrameBuffer.h (modified) (2 diffs)
• UIMultiScreenLayout.cpp (modified) (1 diff)
• fullscreen/UIMachineViewFullscreen.cpp (modified) (1 diff)
• seamless/UIMachineViewSeamless.cpp (modified) (1 diff)

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

@@ -45 +45 @@
     , m_width(0), m_height(0)
     , m_fIsMarkedAsUnused(false)
+    , m_fIsAutoEnabled(false)
 #ifdef Q_OS_WIN
     , m_iRefCnt(0)
@@ -82 +83 @@
     m_fIsMarkedAsUnused = fIsMarkAsUnused;
     unlock();
+}
+
+/**
+ * Returns the framebuffer <b>auto-enabled</b> status.
+ * @returns @c true if guest-screen corresponding to this framebuffer was automatically enabled by
+            the auto-mount guest-screen auto-pilot, @c false otherwise.
+ * @note    <i>Auto-enabled</i> status means the framebuffer was automatically enabled by the multi-screen layout
+ *          and so have potentially incorrect guest size hint posted into guest event queue. Machine-view will try to
+ *          automatically adjust guest-screen size as soon as possible.
+ */
+bool UIFrameBuffer::isAutoEnabled() const
+{
+    return m_fIsAutoEnabled;
+}
+
+/**
+ * Sets the framebuffer <b>auto-enabled</b> status.
+ * @param fIsAutoEnabled determines whether guest-screen corresponding to this framebuffer
+ *        was automatically enabled by the auto-mount guest-screen auto-pilot.
+ * @note  <i>Auto-enabled</i> status means the framebuffer was automatically enabled by the multi-screen layout
+ *        and so have potentially incorrect guest size hint posted into guest event queue. Machine-view will try to
+ *        automatically adjust guest-screen size as soon as possible.
+ */
+void UIFrameBuffer::setAutoEnabled(bool fIsAutoEnabled)
+{
+    m_fIsAutoEnabled = fIsAutoEnabled;
 }
 

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

@@ -107 +107 @@
     void setMarkAsUnused(bool fIsMarkAsUnused);
 
+    /* API: Auto-enabled stuff: */
+    bool isAutoEnabled() const;
+    void setAutoEnabled(bool fIsAutoEnabled);
+
     NS_DECL_ISUPPORTS
 
@@ -214 +218 @@
     int64_t m_WinId;
     bool m_fIsMarkedAsUnused;
+    bool m_fIsAutoEnabled;
 
     /* To avoid a seamless flicker,

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

@@ -175 +175 @@
                 if (pFrameBuffer->height() > 0)
                     uHeight = pFrameBuffer->height();
+                pFrameBuffer->setAutoEnabled(true);
             }
             /* Re-enable guest-screen with proper resolution: */

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

@@ -140 +140 @@
 {
     /* Check if we should adjust guest to new size: */
-    if ((int)frameBuffer()->width() != workingArea().size().width() ||
+    if (frameBuffer()->isAutoEnabled() ||
+        (int)frameBuffer()->width() != workingArea().size().width() ||
         (int)frameBuffer()->height() != workingArea().size().height())
         if (m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
+        {
+            frameBuffer()->setAutoEnabled(false);
             sltPerformGuestResize(workingArea().size());
+        }
 }
 

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

@@ -158 +158 @@
 {
     /* Check if we should adjust guest to new size: */
-    if ((int)frameBuffer()->width() != workingArea().size().width() ||
+    if (frameBuffer()->isAutoEnabled() ||
+        (int)frameBuffer()->width() != workingArea().size().width() ||
         (int)frameBuffer()->height() != workingArea().size().height())
         if (uisession()->isGuestSupportsGraphics())
+        {
+            frameBuffer()->setAutoEnabled(false);
             sltPerformGuestResize(workingArea().size());
+        }
 }