Frontends

Timestamp:

Oct 6, 2011 9:16:20 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: clean up console size hint saving, take 2

Location:

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

Files:

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

-              r38962
+              r38963
     AssertMsg(newSize.isValid(), ("Size should be valid!\n"));
-    /* 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());
 …
 void UIMachineView::storeConsoleSize(int iWidth, int iHeight)
+{
+    m_storedConsoleSize = QSize(iWidth, iHeight);
+    if (m_desktopGeometryType == DesktopGeo_Automatic)
+        m_storedConsoleSize = QSize(iWidth, iHeight);
+}

-              r38962
+              r38963
             setMaximumSize(sizeHint());
-            /* Store the new size to prevent unwanted resize hints being sent back: */
-            storeConsoleSize(pResizeEvent->width(), pResizeEvent->height());
             /* Perform machine-view resize: */
             resize(pResizeEvent->width(), pResizeEvent->height());
 …
                 if (pResizeEvent->size() != workingArea().size())
                     break;
+                /* Store the new size */
+                storeConsoleSize(pResizeEvent->size().width(), pResizeEvent->size().height());
                 if (m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())

-              r38962
+              r38963
             setMaximumSize(sizeHint());
-            /* Store the new size to prevent unwanted resize hints being sent back: */
-            storeConsoleSize(pResizeEvent->width(), pResizeEvent->height());
             /* Perform machine-view resize: */
             resize(pResizeEvent->width(), pResizeEvent->height());
 …
             case QEvent::Resize:
+            {
+                const QSize *pSize = &static_cast<QResizeEvent *>(pEvent)
+                                    ->size();
+                /* Store the new size */
+                storeConsoleSize(pSize->width(), pSize->height());
                 if (pEvent->spontaneous() && m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
                     QTimer::singleShot(300, this, SLOT(sltPerformGuestResize()));
 …
 void UIMachineViewNormal::saveMachineViewSettings()
+{
     /* Store guest size hint: */
+    /* Store guest size in case we are switching to fullscreen: */
     storeGuestSizeHint(QSize(frameBuffer()->width(), frameBuffer()->height()));
+}

-              r38962
+              r38963
             frameBuffer()->setScaledSize(size());
             frameBuffer()->resizeEvent(pResizeEvent);
-            /* Store the new size to prevent unwanted resize hints being sent back: */
-            storeConsoleSize(pResizeEvent->width(), pResizeEvent->height());
             /* Let our toplevel widget calculate its sizeHint properly: */
 …
 void UIMachineViewScale::saveMachineViewSettings()
+{
     /* Store guest size hint: */
+    /* Store guest size in case we are switching to fullscreen: */
     storeGuestSizeHint(QSize(frameBuffer()->width(), frameBuffer()->height()));
+}

-              r38962
+              r38963
             setMaximumSize(sizeHint());
-            /* Store the new size to prevent unwanted resize hints being sent back: */
-            storeConsoleSize(pResizeEvent->width(), pResizeEvent->height());
             /* Perform machine-view resize: */
             resize(pResizeEvent->width(), pResizeEvent->height());
 …
                 if (pResizeEvent->size() != workingArea().size())
                     break;
+                /* Store the new size to prevent unwanted resize hints being sent back: */
+                storeConsoleSize(pResizeEvent->size().width(), pResizeEvent->size().height());
                 if (uisession()->isGuestSupportsGraphics())

Note: See TracChangeset for help on using the changeset viewer.