Changeset 39408 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 24, 2011 1:44:33 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: 5978: Rework mini-toolbar visual representation: Disabling mini-toolbar alpha-mask.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/seamless/UIMachineWindowSeamless.cpp (modified) (1 diff)
• widgets/VBoxMiniToolBar.cpp (modified) (5 diffs)
• widgets/VBoxMiniToolBar.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

@@ -391 +391 @@
     {
         /* Get mini-toolbar mask: */
-        QRegion toolBarRegion(m_pMiniToolBar->mask());
+        QRegion toolBarRegion(m_pMiniToolBar->rect());
 
         /* Move mini-toolbar mask to mini-toolbar position: */

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -67 +67 @@
     setVisible(false);
 
-    /* Left margin of tool-bar: */
-    m_Margins << widgetForAction(addWidget(new QWidget(this)));
-
     /* Add pushpin: */
     m_pAutoHideAction = new QAction(this);
@@ -117 +114 @@
     connect(m_pCloseAction, SIGNAL(triggered()), this, SIGNAL(closeAction()));
     addAction(m_pCloseAction);
-
-    /* Right margin of tool-bar: */
-    m_Margins << widgetForAction(addWidget(new QWidget(this)));
 
     /* Event-filter for parent widget to control resize: */
@@ -334 +328 @@
     if (!m_fPolished)
     {
-        /* Tool-bar margins: */
-        foreach(QWidget *pMargin, m_Margins)
-            pMargin->setMinimumWidth(height());
-
         /* Tool-bar spacings: */
         foreach(QWidget *pSpacing, m_Spacings)
@@ -381 +371 @@
 
     /* Update geometry: */
-    recreateMask();
     moveToBase();
-}
-
-/* Recreate mini-toolbar mask */
-void VBoxMiniToolBar::recreateMask()
-{
-    int iEdgeShift = height();
-    int iPoints[8];
-    switch (m_alignment)
-    {
-        case AlignTop:
-        {
-            iPoints[0] = 0;
-            iPoints[1] = 0;
-
-            iPoints[2] = iEdgeShift;
-            iPoints[3] = height();
-
-            iPoints[4] = width() - iEdgeShift;
-            iPoints[5] = height();
-
-            iPoints[6] = width();
-            iPoints[7] = 0;
-
-            break;
-        }
-        case AlignBottom:
-        {
-            iPoints[0] = iEdgeShift;
-            iPoints[1] = 0;
-
-            iPoints[2] = 0;
-            iPoints[3] = height();
-
-            iPoints[4] = width();
-            iPoints[5] = height();
-
-            iPoints[6] = width() - iEdgeShift;
-            iPoints[7] = 0;
-
-            break;
-        }
-        default:
-            break;
-    }
-    /* Make sure any old mask is removed first: */
-    clearMask();
-    /* Set the new mask */
-    QPolygon polygon;
-    polygon.setPoints(4, iPoints);
-    setMask(polygon);
 }
 

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -79 +79 @@
 
     void initialize();
-    void recreateMask();
     void moveToBase();
     void setMouseTrackingEnabled(bool fEnabled);
@@ -104 +103 @@
 
     /* Lists of used spacers */
-    QList<QWidget*> m_Margins;
     QList<QWidget*> m_Spacings;
     QList<QWidget*> m_LabelMargins;