Changeset 6441 in vbox

Timestamp:

Jan 22, 2008 1:44:12 PM (17 years ago)

Author:

vboxsync

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

27416

Message:

Fixed wrong display in seamless mode if the toolbars (gnome-panel, windows taskbar, mac dock) of the host are not on the bottom of the screen but on the top/left/right or all together.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h

@@ -182 +182 @@
     void onExitFullscreen();
 
+    void setViewInSeamlessMode(const QRect& targetRect);
+
 private:
 
@@ -248 +250 @@
     bool statusBarChangedInside;
 
-    QSpacerItem *mShiftingSpacer;
+    QSpacerItem *mShiftingSpacerLeft;
+    QSpacerItem *mShiftingSpacerTop;
+    QSpacerItem *mShiftingSpacerRight;
+    QSpacerItem *mShiftingSpacerBottom;
 
 #ifdef VBOX_WITH_DEBUGGER_GUI

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -1057 +1057 @@
                 mIgnoreMainwndResize = oldIgnoreMainwndResize;
 
-                /* emit a signal about guest was resized */
-                emit resizeHintDone();
-
                 /* update geometry after entering fullscreen | seamless */
                 if (mMainWnd->isTrueFullscreen() || mMainWnd->isTrueSeamless())
                     updateGeometry();
 
+                /* make sure that all posted signals are processed */
+                qApp->processEvents();
+
+                /* emit a signal about guest was resized */
+                emit resizeHintDone();
+              
                 return true;
             }

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -631 +631 @@
     {
         setCentralWidget (new QWidget (this, "centralWidget"));
-        new QBoxLayout (centralWidget(), QBoxLayout::Down);
+        QGridLayout *pMainLayout = new QGridLayout(centralWidget(), 3, 3, 0, 0);
+        mShiftingSpacerLeft = new QSpacerItem (0, 0, 
+                                               QSizePolicy::Fixed,
+                                               QSizePolicy::Fixed);
+        mShiftingSpacerTop = new QSpacerItem (0, 0, 
+                                              QSizePolicy::Fixed,
+                                              QSizePolicy::Fixed);
+        mShiftingSpacerRight = new QSpacerItem (0, 0, 
+                                                QSizePolicy::Fixed,
+                                                QSizePolicy::Fixed);
+        mShiftingSpacerBottom = new QSpacerItem (0, 0, 
+                                                 QSizePolicy::Fixed,
+                                                 QSizePolicy::Fixed);
+        pMainLayout->addItem(mShiftingSpacerLeft, 1, 0);
+        pMainLayout->addMultiCell(mShiftingSpacerTop, 0, 0, 0, 2);
+        pMainLayout->addItem(mShiftingSpacerRight, 1, 2);
+        pMainLayout->addMultiCell(mShiftingSpacerBottom, 2, 2, 0, 2);
     }
 
@@ -646 +662 @@
     activateUICustomizations();
 
-    ((QBoxLayout*) centralWidget()->layout())->addWidget (
-        console, 0, AlignVCenter | AlignHCenter);
-
-    mShiftingSpacer = new QSpacerItem (0, 0, QSizePolicy::Expanding,
-                                             QSizePolicy::Fixed);
-    ((QBoxLayout*) centralWidget()->layout())->addItem (mShiftingSpacer);
-
+    static_cast<QGridLayout*>(centralWidget()->layout())->addWidget(console, 1, 1, AlignVCenter | AlignHCenter);
+    
     CMachine cmachine = csession.GetMachine();
 
@@ -996 +1007 @@
 {
     disconnect (console, SIGNAL (resizeHintDone()), 0, 0);
+#ifndef Q_WS_MAC 
+    /* It isn't guaranteed that the guest os set the video mode that
+     * we requested. So after all the resizing stuff set the clipping 
+     * mask and the spacing shifter to the corresponding values. */
+    setViewInSeamlessMode(QRect(console->mapToGlobal(QPoint(0, 0)), console->size()));
+#endif
 
     vmSeamlessAction->setEnabled (mIsSeamless);
@@ -1895 +1912 @@
 bool VBoxConsoleWnd::toggleFullscreenMode (bool aOn, bool aSeamless)
 {
+
     if (aSeamless)
     {
@@ -1995 +2013 @@
             dtw->availableGeometry (this) : dtw->screenGeometry (this);
 
-        /* Calculate the difference region between current mode
-         * (fullscreen or seamless) and the screen geometry. */
-        mStrictedRegion =
-            QRegion (dtw->screenGeometry (this)) - scrGeo;
-
-        /* Setup the shifting spacer to make the console to be aligned on top
-         * in the seamless mode. */
-#ifdef Q_WS_MAC 
-        mShiftingSpacer->changeSize (0,  dtw->screenGeometry(this).bottom() - scrGeo.bottom(),
-                                     QSizePolicy::Preferred, QSizePolicy::Fixed);
-#else
-        mShiftingSpacer->changeSize (0, mStrictedRegion.boundingRect().height(),
-                                     QSizePolicy::Preferred, QSizePolicy::Fixed);
-#endif
+        /* It isn't guaranteed that the guest os set the video mode that
+         * we requested. So after all the resizing stuff set the clipping 
+         * mask and the spacing shifter to the corresponding values. */
+        setViewInSeamlessMode(dtw->availableGeometry(this));
 
 #ifdef Q_WS_WIN32
@@ -2052 +2060 @@
         setWindowState (windowState() ^ WindowFullScreen);
 #ifdef Q_WS_MAC /* setMask seems to not include the far border pixels. */
-        QRect maskRect = dtw->screenGeometry (this);
-        maskRect.setRight (maskRect.right() + 1);
-        maskRect.setBottom (maskRect.bottom() + 1);
-        setMask (maskRect);
+//        QRect maskRect = dtw->screenGeometry (this);
+//        maskRect.setRight (maskRect.right() + 1);
+//        maskRect.setBottom (maskRect.bottom() + 1);
+//        setMask (maskRect);
+
 #else
-        setMask (dtw->screenGeometry (this));
+//        setMask (dtw->screenGeometry (this));
 #endif
 
@@ -2073 +2082 @@
 
         /* Reset the shifting spacer. */
-        mShiftingSpacer->changeSize (0, 0, QSizePolicy::Preferred,
-                                           QSizePolicy::Fixed);
+        mShiftingSpacerLeft->changeSize (0, 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
+        mShiftingSpacerTop->changeSize (0, 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
+        mShiftingSpacerRight->changeSize (0, 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
+        mShiftingSpacerBottom->changeSize (0, 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
 
         /* Restore the previous scroll-view minimum size before the exiting
@@ -2121 +2132 @@
 // Private slots
 /////////////////////////////////////////////////////////////////////////////
+void VBoxConsoleWnd::setViewInSeamlessMode(const QRect& targetRect)
+{
+    if (mIsSeamless)
+    {
+        /* It isn't guaranteed that the guest os set the video mode that
+         * we requested. So after all the resizing stuff set the clipping 
+         * mask and the spacing shifter to the corresponding values. */
+        QDesktopWidget *dtw = QApplication::desktop();
+        QRect sRect = dtw->screenGeometry (this);
+        QRect aRect(targetRect);
+        QRect a1Rect(targetRect);
+#ifdef Q_WS_MAC
+        /* On mac os x this isn't necessary cause the screen starts
+         * by y=0 always regardless if there is the global menubar or not. */
+        aRect.setRect(aRect.left(), 0, aRect.width(), aRect.height()+aRect.top());
+        a1Rect.setRect(a1Rect.left(), 0, a1Rect.width(), a1Rect.height());
+#endif // Q_WS_MAC
+        /* Set the clipping mask */
+        mStrictedRegion = QRegion(sRect) - a1Rect;
+        /* Set the shifting spacer */
+        mShiftingSpacerLeft->changeSize(RT_ABS(sRect.left() - aRect.left()), 0,
+                                        QSizePolicy::Fixed, QSizePolicy::Preferred);
+        mShiftingSpacerTop->changeSize(0, RT_ABS(sRect.top() - aRect.top()),
+                                       QSizePolicy::Preferred, QSizePolicy::Fixed);
+        mShiftingSpacerRight->changeSize(RT_ABS(sRect.right() - aRect.right()), 0,
+                                         QSizePolicy::Fixed, QSizePolicy::Preferred);
+        mShiftingSpacerBottom->changeSize(0, RT_ABS(sRect.bottom() - aRect.bottom()),
+                                          QSizePolicy::Preferred, QSizePolicy::Fixed);
+    }
+}
 
 void VBoxConsoleWnd::vmFullscreen (bool aOn)
@@ -2513 +2554 @@
 void VBoxConsoleWnd::setMask (const QRegion &aRegion)
 {
-    QRegion region = aRegion - mStrictedRegion;
+    QRegion region = aRegion;
+    region.translate(mShiftingSpacerLeft->sizeHint().width(), mShiftingSpacerTop->sizeHint().height());
+    region -= mStrictedRegion;
+
+#ifdef Q_WS_MAC
+    /* This is necessary to avoid the flicker by
+     * an mask update. 
+     * See http://lists.apple.com/archives/Carbon-development/2001/Apr/msg01651.html
+     * for the hint.
+     * There *must* be a better solution. */
+    if(!region.isEmpty())
+      region |= QRect(0, 0, 1, 1);
+#endif 
 
 #ifdef Q_WS_WIN
@@ -2520 +2573 @@
     /* Region offset calculation */
     int fleft = 0, ftop = 0;
-    if (isTopLevel())
-    {
-        ftop = topData()->ftop;
-        fleft = topData()->fleft;
-    }
+    /* I think this isn't necessary anymore because the 4 shifting spacer.
+     * Has to be verified. */
+//    if (isTopLevel())
+//    {
+//        ftop = topData()->ftop;
+//        fleft = topData()->fleft;
+//    }
 
     /* Visible region calculation */
@@ -3035 +3090 @@
     vmAutoresizeGuestAction->setEnabled (aActive);
     vmSeamlessAction->setEnabled (aSeamlessSupported);
-#ifndef Q_WS_MAC /** @todo fix seamless mode on Mac OS X. It is temporarily disabled to prevent bogus bugreports for the beta 3 / beta 2 leopard update. */
+//#ifndef Q_WS_MAC /** @todo fix seamless mode on Mac OS X. It is temporarily disabled to prevent bogus bugreports for the beta 3 / beta 2 leopard update. */
     mIsSeamlessSupported = aSeamlessSupported;
-#endif
+//#endif
     /* If seamless mode should be enabled then check if it is enabled
      * currently and re-enable it if open-view procedure is finished */