Changeset 20200 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 2, 2009 4:18:04 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 3948: Mini-ToolBar for Full-screen & Seamless modes: re-parenting tool-bar to centralWidget(), fixing different bugs.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

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

@@ -102 +102 @@
 
     QRect desktopGeometry();
+
+    QRegion lastVisibleRegion() const;
 
     bool isAutoresizeGuestActive();

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

@@ -254 +254 @@
     void mtExitMode();
     void mtCloseVM();
+    void mtMaskUpdate();
 
 private:

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

@@ -49 +49 @@
     };
 
-    VBoxMiniToolBar (Alignment aAlignment);
+    VBoxMiniToolBar (QWidget *aParent, Alignment aAlignment);
+
+    void setIsSeamlessMode (bool aIsSeamless);
 
     VBoxMiniToolBar& operator<< (QList <QMenu*> aMenus);
@@ -60 +62 @@
     void exitAction();
     void closeAction();
+    void geometryUpdated();
 
 protected:
 
-    void resizeEvent (QResizeEvent *aEvent);
     void mouseMoveEvent (QMouseEvent *aEvent);
     void timerEvent (QTimerEvent *aEvent);
@@ -73 +75 @@
 
 private:
+
+    void recreateMask();
+    void moveToBase();
+    QPoint mapFromScreen (const QPoint &aPoint);
 
     QAction *mAutoHideAct;
@@ -88 +94 @@
     int mPositionX;
     int mPositionY;
+
+    bool mIsSeamless;
 
     /* Lists of used spacers */

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

@@ -2634 +2634 @@
 }
 
+QRegion VBoxConsoleView::lastVisibleRegion() const
+{
+    return mLastVisibleRegion;
+}
+
 bool VBoxConsoleView::isAutoresizeGuestActive()
 {

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

@@ -520 +520 @@
     mMiniVMMenu->addAction (mVmPauseAction);
     mMiniVMMenu->addAction (mVmACPIShutdownAction);
-
-    /* Mini toolbar */
-    QList <QMenu*> menus (QList <QMenu*> () << mMiniVMMenu << mDevicesMenu);
-    mMiniToolBar = new VBoxMiniToolBar (VBoxMiniToolBar::AlignBottom);
-    *mMiniToolBar << menus;
-    connect (mMiniToolBar, SIGNAL (exitAction()), this, SLOT (mtExitMode()));
-    connect (mMiniToolBar, SIGNAL (closeAction()), this, SLOT (mtCloseVM()));
-    connect (this, SIGNAL (closing()), mMiniToolBar, SLOT (close()));
 
     ///// Status bar ////////////////////////////////////////////////////////
@@ -818 +810 @@
                                    centralWidget());
 
+    /* Mini toolbar */
+    QList <QMenu*> menus (QList <QMenu*> () << mMiniVMMenu << mDevicesMenu);
+    mMiniToolBar = new VBoxMiniToolBar (centralWidget(), VBoxMiniToolBar::AlignBottom);
+    *mMiniToolBar << menus;
+    connect (mMiniToolBar, SIGNAL (exitAction()), this, SLOT (mtExitMode()));
+    connect (mMiniToolBar, SIGNAL (closeAction()), this, SLOT (mtCloseVM()));
+    connect (mMiniToolBar, SIGNAL (geometryUpdated()), this, SLOT (mtMaskUpdate()));
+    connect (this, SIGNAL (closing()), mMiniToolBar, SLOT (close()));
+
     activateUICustomizations();
 
@@ -2440 +2441 @@
     if (aOn)
     {
+        mMiniToolBar->setIsSeamlessMode (aSeamless);
         mMiniToolBar->updateDisplay (true, true);
     }
@@ -2573 +2575 @@
 }
 
+void VBoxConsoleWnd::mtMaskUpdate()
+{
+    if (mIsSeamless)
+        setMask (console->lastVisibleRegion());
+}
+
 void VBoxConsoleWnd::vmFullscreen (bool aOn)
 {
@@ -2989 +2997 @@
 {
     QRegion region = aRegion;
+
     /* The global mask shift cause of toolbars and such things. */
     region.translate (mMaskShift.width(), mMaskShift.height());
+
+    /* Including mini toolbar area */
+    QRegion toolBarRegion (mMiniToolBar->mask());
+    toolBarRegion.translate (mMiniToolBar->mapToGlobal (toolBarRegion.boundingRect().topLeft()) - QPoint (1, 0));
+    region += toolBarRegion;
+
     /* Restrict the drawing to the available space on the screen.
      * (The &operator is better than the previous used -operator,

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

@@ -35 +35 @@
 #include <QTimer>
 
-VBoxMiniToolBar::VBoxMiniToolBar (Alignment aAlignment)
-    : VBoxToolBar (0)
+VBoxMiniToolBar::VBoxMiniToolBar (QWidget *aParent, Alignment aAlignment)
+    : VBoxToolBar (aParent)
     , mAutoHideCounter (0)
     , mAutoHide (true)
@@ -42 +42 @@
     , mHideAfterSlide (false)
     , mPolished (false)
+    , mIsSeamless (false)
     , mAlignment (aAlignment)
     , mAnimated (true)
@@ -48 +49 @@
     , mAutoHideTotalCounter (10)
 {
-    /* Play with toolbar mode as child of the main window, rather than top parentless */
-    //setAllowedAreas (Qt::NoToolBarArea);
-    //mMainWindow->addToolBar (/* Qt::NoToolBarArea, */ this);
-
-    setWindowFlags (Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
+    AssertMsg (parentWidget(), ("Parent widget must be set!!!\n"));
+
+    /* Various options */
+    setAutoFillBackground (true);
     setIconSize (QSize (16, 16));
     setMouseTracking (mAutoHide);
     setVisible (false);
-
-    // TODO, we need to hide the tab icon in taskbar when in seamless mode
-    setWindowTitle (tr ("VirtualBox Mini Toolbar"));
 
     /* Left margin of tool-bar */
@@ -108 +105 @@
 }
 
+void VBoxMiniToolBar::setIsSeamlessMode (bool aIsSeamless)
+{
+    mIsSeamless = aIsSeamless;
+}
+
 VBoxMiniToolBar& VBoxMiniToolBar::operator<< (QList <QMenu*> aMenus)
 {
@@ -131 +133 @@
     if (aShow)
     {
+        if (isHidden())
+            moveToBase();
+
         if (mAnimated)
         {
@@ -174 +179 @@
 {
     mDisplayLabel->setText (aText);
-}
-
-void VBoxMiniToolBar::resizeEvent (QResizeEvent*)
-{
-    /* Create polygon shaped toolbar */
-    int triangular_x = height();
-    int points [8];
-    switch (mAlignment)
-    {
-        case AlignTop:
-        {
-            points [0] = 0;
-            points [1] = 0;
-
-            points [2] = triangular_x;
-            points [3] = height();
-
-            points [4] = width() - triangular_x;
-            points [5] = height();
-
-            points [6] = width();
-            points [7] = 0;
-
-            break;
-        }
-        case AlignBottom:
-        {
-            points [0] = triangular_x;
-            points [1] = 0;
-
-            points [2] = 0;
-            points [3] = height();
-
-            points [4] = width();
-            points [5] = height();
-
-            points [6] = width() - triangular_x;
-            points [7] = 0;
-
-            break;
-        }
-        default:
-            break;
-    }
-    QPolygon polygon;
-    polygon.setPoints (4, points);
-    setMask (polygon);
-
-    /* Set the initial position */
-    QRect d = QApplication::desktop()->screenGeometry (this);
-    mPositionX = d.width() / 2 - width() / 2;
-    switch (mAlignment)
-    {
-        case AlignTop:
-        {
-            mPositionY = - height() + 1;
-            break;
-        }
-        case AlignBottom:
-        {
-            mPositionY = d.height() - 1;
-            break;
-        }
-        default:
-        {
-            mPositionY = 0;
-            break;
-        }
-    }
-    move (mPositionX, mPositionY);
 }
 
@@ -282 +217 @@
             case AlignBottom:
             {
-                QRect d = QApplication::desktop()->screenGeometry (this);
-                if (((mPositionY == d.height() - height()) && mSlideToScreen) ||
-                    ((mPositionY == d.height() - 1) && !mSlideToScreen))
+                QRect screen = mIsSeamless ? QApplication::desktop()->availableGeometry (this) :
+                                             QApplication::desktop()->screenGeometry (this);
+                if (((mPositionY == screen.height() - height()) && mSlideToScreen) ||
+                    ((mPositionY == screen.height() - 1) && !mSlideToScreen))
                 {
                     mScrollTimer.stop();
@@ -300 +236 @@
                 break;
         }
-        move (mPositionX, mPositionY);
+        move (mapFromScreen (QPoint (mPositionX, mPositionY)));
+        emit geometryUpdated();
     }
     else if (aEvent->timerId() == mAutoScrollTimer.timerId())
@@ -344 +281 @@
         resize (sizeHint());
 
+        /* Initialize */
+        recreateMask();
+        moveToBase();
+
         mPolished = true;
     }
@@ -356 +297 @@
 }
 
+void VBoxMiniToolBar::recreateMask()
+{
+    int edgeShift = height();
+    int points [8];
+    switch (mAlignment)
+    {
+        case AlignTop:
+        {
+            points [0] = 0;
+            points [1] = 0;
+
+            points [2] = edgeShift;
+            points [3] = height();
+
+            points [4] = width() - edgeShift;
+            points [5] = height();
+
+            points [6] = width();
+            points [7] = 0;
+
+            break;
+        }
+        case AlignBottom:
+        {
+            points [0] = edgeShift;
+            points [1] = 0;
+
+            points [2] = 0;
+            points [3] = height();
+
+            points [4] = width();
+            points [5] = height();
+
+            points [6] = width() - edgeShift;
+            points [7] = 0;
+
+            break;
+        }
+        default:
+            break;
+    }
+    QPolygon polygon;
+    polygon.setPoints (4, points);
+    setMask (polygon);
+}
+
+void VBoxMiniToolBar::moveToBase()
+{
+    QRect screen = mIsSeamless ? QApplication::desktop()->availableGeometry (this) :
+                                 QApplication::desktop()->screenGeometry (this);
+    mPositionX = screen.width() / 2 - width() / 2;
+    switch (mAlignment)
+    {
+        case AlignTop:
+        {
+            mPositionY = - height() + 1;
+            break;
+        }
+        case AlignBottom:
+        {
+            mPositionY = screen.height() - 1;
+            break;
+        }
+        default:
+        {
+            mPositionY = 0;
+            break;
+        }
+    }
+    move (mapFromScreen (QPoint (mPositionX, mPositionY)));
+}
+
+QPoint VBoxMiniToolBar::mapFromScreen (const QPoint &aPoint)
+{
+    QPoint globalPosition = parentWidget()->mapFromGlobal (aPoint);
+    QRect fullArea = QApplication::desktop()->screenGeometry (this);
+    QRect realArea = mIsSeamless ? QApplication::desktop()->availableGeometry (this) :
+                                   QApplication::desktop()->screenGeometry (this);
+    QPoint shiftToReal (realArea.topLeft() - fullArea.topLeft());
+    return globalPosition + shiftToReal;
+}
+