Changeset 15467 in vbox

Timestamp:

Dec 14, 2008 3:44:59 PM (16 years ago)

Author:

vboxsync

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

40921

Message:

FE/Qt4-OSX: Fixed position/size of the VM window after a VM snapshot is
restored which was in seamless mode on save (#3306).

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

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

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxConsoleWnd.h ¶

@@ -74 +74 @@
     void refreshView();
 
+    bool isWindowMaximized() const 
+    { 
+#ifdef Q_WS_MAC
+        /* On Mac OS X we didn't really jump to the fullscreen mode but
+         * maximize the window. This situation has to be considered when
+         * checking for maximized or fullscreen mode. */
+        return !(isTrueSeamless()) && QMainWindow::isMaximized();
+#else /* Q_WS_MAC */
+        return QMainWindow::isMaximized();
+#endif /* Q_WS_MAC */ 
+    }
+    bool isWindowFullScreen() const 
+    { 
+#ifdef Q_WS_MAC
+        /* On Mac OS X we didn't really jump to the fullscreen mode but
+         * maximize the window. This situation has to be considered when
+         * checking for maximized or fullscreen mode. */
+        return isTrueFullscreen() || isTrueSeamless();
+#else /* Q_WS_MAC */
+        return QMainWindow::isFullscreen();
+#endif /* Q_WS_MAC */ 
+    }
+
     bool isTrueFullscreen() const { return mIsFullscreen; }
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleView.cpp ¶

@@ -947 +947 @@
     /* Make no normalizeGeometry in case we are in manual resize
      * mode or main window is maximized */
-    if (mMainWnd->isMaximized() || mMainWnd->isFullScreen())
+    if (mMainWnd->isWindowMaximized() || mMainWnd->isWindowFullScreen())
         return;
 
@@ -2374 +2374 @@
 {
     if ((mGuestSupportsGraphics && mAutoresizeGuest) ||
+        mMainWnd->isTrueSeamless() ||
         mMainWnd->isTrueFullscreen())
     {

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp ¶

@@ -1235 +1235 @@
             QResizeEvent *re = (QResizeEvent *) e;
 
-            if (!mIsWaitingModeResize && !isMaximized() &&
+            if (!mIsWaitingModeResize && !isWindowMaximized() &&
                 !isTrueFullscreen() && !isTrueSeamless())
             {
@@ -1256 +1256 @@
         case QEvent::Move:
         {
-            if (!isMaximized() && !isTrueFullscreen() && !isTrueSeamless())
+            if (!isWindowMaximized() && !isTrueFullscreen() && !isTrueSeamless())
             {
                 mNormalGeo.moveTo (geometry().x(), geometry().y());
@@ -1551 +1551 @@
             .arg (mNormalGeo.x()).arg (mNormalGeo.y())
             .arg (mNormalGeo.width()).arg (mNormalGeo.height());
-        if (isMaximized() || (mIsFullscreen && was_max)
+        if (isWindowMaximized() || (mIsFullscreen && was_max)
                           || (mIsSeamless && was_max))
             winPos += QString (",%1").arg (VBoxDefs::GUI_LastWindowPosition_Max);
@@ -2144 +2144 @@
 {
     /* Please note: For some platforms like the Mac, the calling order of the
-     * functions in this methods is vital. So please be carefull on changing
+     * functions in this methods is vital. So please be careful on changing
      * this. */
 
@@ -2264 +2264 @@
         /* Memorize the maximized state. */
         QDesktopWidget *dtw = QApplication::desktop();
-        was_max = isMaximized() &&
+        was_max = isWindowMaximized() &&
                   dtw->availableGeometry().width()  == frameSize().width() &&
                   dtw->availableGeometry().height() == frameSize().height();
@@ -2338 +2338 @@
              * window switch back to normal size. Qt changes the winId on the
              * fullscreen switch and make this stuff useless with the old
-             * winId. So please be carefull on rearrangement of the method
+             * winId. So please be careful on rearrangement of the method
              * calls. */
             /* Undo all mac specific installations */
@@ -2383 +2383 @@
          * switched to fullscreen. Qt changes the winId on the fullscreen
          * switch and make this stuff useless with the old winId. So please be
-         * carefull on rearrangement of the method calls. */
+         * careful on rearrangement of the method calls. */
         OSStatus status;
         HIViewRef viewRef = ::darwinToHIViewRef (console->viewport());
@@ -2423 +2423 @@
 #endif
 
+    /* Send guest size hint */
+    console->toggleFSMode (consoleSize);
+
     /* Process all console attributes changes and sub-widget hidings */
     qApp->processEvents();
-
-    /* Send guest size hint */
-    console->toggleFSMode (consoleSize);
 
     if (!mIsWaitingModeResize)
@@ -2584 +2584 @@
     if (console)
     {
-        if (isMaximized())
+        if (isWindowMaximized())
             showNormal();
         console->normalizeGeometry (true /* adjustPosition */);
@@ -2992 +2992 @@
         HIViewReshapeStructure (::darwinToHIViewRef (console->viewport()));
 //        HIWindowInvalidateShadow (::darwinToWindowRef (console->viewport()));
-//        ReshapeCustomWindow (mapToWindowRef (this));
+//        ReshapeCustomWindow (::darwinToWindowRef (this));
     }
     else