Changeset 38987 in vbox

Timestamp:

Oct 13, 2011 3:24:14 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: cleanup of r74363 after review

Location:

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

Files:

• UIMachineView.cpp (modified) (7 diffs)
• UIMachineView.h (modified) (2 diffs)
• fullscreen/UIMachineViewFullscreen.cpp (modified) (1 diff)

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

@@ -113 +113 @@
 #endif /* VBOX_WITH_VIDEOHWACCEL */
                                                        );
-            pMachineView->m_fIsFullscreen = true;
             break;
         case UIVisualStateType_Seamless:
@@ -122 +121 @@
 #endif /* VBOX_WITH_VIDEOHWACCEL */
                                                      );
-            pMachineView->m_fIsFullscreen = true;
             break;
         case UIVisualStateType_Scale:
@@ -167 +165 @@
      * fullscreen resize hint was sent: */
     machine.SetExtraData(VBoxDefs::GUI_LastGuestSizeHintWasFullscreen,
-                         m_fIsFullscreen ? "true" : "");
+                         isFullscreenOrSeamless() ? "true" : "");
 }
 
@@ -234 +232 @@
                              )
     : QAbstractScrollArea(pMachineWindow->machineWindow())
-    , m_fIsFullscreen(false)
     , m_pMachineWindow(pMachineWindow)
     , m_uScreenId(uScreenId)
@@ -850 +847 @@
 #endif /* Q_WS_MAC */
 
-bool UIMachineView::guestResizeEvent(QEvent *pEvent, bool fFullscreen)
+bool UIMachineView::guestResizeEvent(QEvent *pEvent,
+                                     bool fFullscreenOrSeamless)
 {
     /* Some situations require framebuffer resize events to be ignored at all,
@@ -883 +881 @@
 
     /* Normalize machine-window geometry: */
-    if (!fFullscreen)
+    if (!fFullscreenOrSeamless)
         normalizeGeometry(true /* Adjust Position? */);
 
@@ -899 +897 @@
     pEvent->accept();
     return true;
+}
+
+bool UIMachineView::isFullscreenOrSeamless()
+{
+    UIVisualStateType type = machineLogic()->visualStateType();
+    return    type == UIVisualStateType_Fullscreen
+           || type == UIVisualStateType_Fullscreen;
 }
 

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

@@ -71 +71 @@
     /* Utility signals: */
     void resizeHintDone();
-
-private:
-
-    /** Is this a fullscreen-type view? */
-    bool m_fIsFullscreen;
 
 protected slots:
@@ -158 +153 @@
 #endif /* Q_WS_MAC */
     bool guestResizeEvent(QEvent *pEvent, bool fFullscreen);
+    /** Is this a fullscreen-type view? */
+    bool isFullscreenOrSeamless();
 
     /* Cross-platforms event processors: */

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

@@ -128 +128 @@
                 /* Send guest-resize hint only if top window resizing to required dimension: */
                 QResizeEvent *pResizeEvent = static_cast<QResizeEvent*>(pEvent);
-                /** @todo why is this here?  If it is a workaround
-                 * for some situation that should be documented. */
                 if (pResizeEvent->size() != workingArea().size())
                     break;