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

Timestamp:

Aug 13, 2014 5:30:32 PM (11 years ago)

Author:

vboxsync

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

95510

Message:

FE/Qt: Runtime UI: Mini-toolbar: Make it always separate tool window.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/fullscreen/UIMachineWindowFullscreen.cpp (modified) (1 diff)
• runtime/seamless/UIMachineWindowSeamless.cpp (modified) (1 diff)
• widgets/UIMiniToolBar.cpp (modified) (9 diffs)
• widgets/UIMiniToolBar.h (modified) (6 diffs)

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

@@ -221 +221 @@
     /* Create mini-toolbar: */
     m_pMiniToolBar = new UIRuntimeMiniToolBar(this,
-                                              IntegrationMode_Embedded,
+                                              GeometryType_Full,
                                               gEDataManager->miniToolbarAlignment(vboxGlobal().managedVMUuid()),
                                               gEDataManager->autoHideMiniToolbar(vboxGlobal().managedVMUuid()));

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

@@ -112 +112 @@
     /* Create mini-toolbar: */
     m_pMiniToolBar = new UIRuntimeMiniToolBar(this,
-                                              IntegrationMode_External,
+                                              GeometryType_Available,
                                               gEDataManager->miniToolbarAlignment(vboxGlobal().managedVMUuid()),
                                               gEDataManager->autoHideMiniToolbar(vboxGlobal().managedVMUuid()));

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

@@ -42 +42 @@
 
 UIRuntimeMiniToolBar::UIRuntimeMiniToolBar(QWidget *pParent,
-                                           IntegrationMode integrationMode,
+                                           GeometryType geometryType,
                                            Qt::Alignment alignment,
                                            bool fAutoHide /* = true */)
-    : QWidget(pParent)
+    : QWidget(pParent, Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint)
     /* Variables: General stuff: */
-    , m_integrationMode(integrationMode)
+    , m_geometryType(geometryType)
     , m_alignment(alignment)
     , m_fAutoHide(fAutoHide)
@@ -86 +86 @@
 }
 
-void UIRuntimeMiniToolBar::setIntegrationMode(IntegrationMode integrationMode)
-{
-    /* Make sure integration-mode really changed: */
-    if (m_integrationMode == integrationMode)
-        return;
-
-    /* Update integration-mode: */
-    m_integrationMode = integrationMode;
-
-    /* Re-integrate: */
-    integrate();
-
-    /* Re-initialize: */
-    adjustGeometry();
-
-    /* Propagate to child to update shape: */
-    m_pToolbar->setIntegrationMode(m_integrationMode);
-}
-
-void UIRuntimeMiniToolBar::setAutoHide(bool fAutoHide, bool fPropagateToChild /* = true*/)
+void UIRuntimeMiniToolBar::setAutoHide(bool fAutoHide, bool fPropagateToChild /* = true */)
 {
     /* Make sure auto-hide really changed: */
@@ -153 +134 @@
     QRect screenRect;
     int iX = 0, iY = 0;
-    switch (m_integrationMode)
-    {
-        case IntegrationMode_Embedded:
-        {
-            /* Screen geometry: */
-            screenRect = QApplication::desktop()->screenGeometry(iHostScreen);
-            /* Local coordinates, tool-bar is a child of the parent-widget: */
-            iX = screenRect.width() / 2 - width() / 2;
-            switch (m_alignment)
-            {
-                case Qt::AlignTop:
-                    iY = 0;
-                    break;
-                case Qt::AlignBottom:
-                    iY = screenRect.height() - height();
-                    break;
-            }
-            break;
-        }
-        case IntegrationMode_External:
-        {
-            /* Available geometry: */
-            screenRect = vboxGlobal().availableGeometry(iHostScreen);
-            /* Global coordinates, tool-bar is tool-window aligned according the parent-widget: */
-            iX = screenRect.x() + screenRect.width() / 2 - width() / 2;
-            switch (m_alignment)
-            {
-                case Qt::AlignTop:
-                    iY = screenRect.y();
-                    break;
-                case Qt::AlignBottom:
-                    iY = screenRect.y() + screenRect.height() - height();
-                    break;
-            }
-            break;
-        }
+    switch (m_geometryType)
+    {
+        case GeometryType_Available: screenRect = vboxGlobal().availableGeometry(iHostScreen); break;
+        case GeometryType_Full:      screenRect = QApplication::desktop()->screenGeometry(iHostScreen); break;
+        default: break;
+    }
+    iX = screenRect.x() + screenRect.width() / 2 - width() / 2;
+    switch (m_alignment)
+    {
+        case Qt::AlignTop:    iY = screenRect.y(); break;
+        case Qt::AlignBottom: iY = screenRect.y() + screenRect.height() - height(); break;
+        default: break;
     }
     move(iX, iY);
@@ -240 +197 @@
 void UIRuntimeMiniToolBar::prepare()
 {
-    /* Allow any size: */
-    setMinimumSize(1, 1);
+#ifdef VBOX_RUNTIME_UI_WITH_SHAPED_MINI_TOOLBAR
+    /* Using Qt API to enable translucent background: */
+    setAttribute(Qt::WA_TranslucentBackground, true);
+#endif /* VBOX_RUNTIME_UI_WITH_SHAPED_MINI_TOOLBAR */
+
     /* Make sure we have no focus: */
     setFocusPolicy(Qt::NoFocus);
@@ -248 +208 @@
     m_pMdiArea = new QMdiArea;
     {
+        /* Allow any MDI area size: */
+        m_pMdiArea->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
         /* Configure own background: */
         QPalette pal = m_pMdiArea->palette();
@@ -271 +233 @@
         m_pToolbar->setAutoHide(m_fAutoHide);
         m_pToolbar->setAlignment(m_alignment);
-        m_pToolbar->setIntegrationMode(m_integrationMode);
         /* Configure own background: */
         QPalette pal = m_pToolbar->palette();
@@ -312 +273 @@
                                                          true);
 
-    /* Integrate if necessary: */
-    integrate();
-
     /* Adjust geometry finally: */
     adjustGeometry();
+
+    /* Show: */
+    show();
 }
 
@@ -421 +382 @@
     AssertPtrReturn(m_pEmbeddedToolbar, QPoint());
     return m_pEmbeddedToolbar->pos();
-}
-
-void UIRuntimeMiniToolBar::integrate()
-{
-    /* Reintegrate if necessary: */
-    if (m_integrationMode == IntegrationMode_Embedded && isWindow())
-    {
-        setWindowFlags(Qt::Widget);
-#ifdef VBOX_RUNTIME_UI_WITH_SHAPED_MINI_TOOLBAR
-        setAttribute(Qt::WA_TranslucentBackground, false);
-#endif /* VBOX_RUNTIME_UI_WITH_SHAPED_MINI_TOOLBAR */
-        show();
-    }
-    else if (m_integrationMode == IntegrationMode_External && !isWindow())
-    {
-        setWindowFlags(Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
-#ifdef VBOX_RUNTIME_UI_WITH_SHAPED_MINI_TOOLBAR
-        setAttribute(Qt::WA_TranslucentBackground, true);
-#endif /* VBOX_RUNTIME_UI_WITH_SHAPED_MINI_TOOLBAR */
-        show();
-    }
 }
 
@@ -472 +412 @@
     /* Update alignment: */
     m_alignment = alignment;
-
-    /* Rebuild shape: */
-    rebuildShape();
-}
-
-void UIMiniToolBar::setIntegrationMode(IntegrationMode integrationMode)
-{
-    /* Make sure integration-mode really changed: */
-    if (m_integrationMode == integrationMode)
-        return;
-
-    /* Update integration-mode: */
-    m_integrationMode = integrationMode;
 
     /* Rebuild shape: */

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

@@ -36 +36 @@
 class UIAnimation;
 
-/* IntegrationMode enum: */
-enum IntegrationMode
+/** Geometry types. */
+enum GeometryType
 {
-    IntegrationMode_Embedded,
-    IntegrationMode_External
+    GeometryType_Available,
+    GeometryType_Full
 };
 
@@ -71 +71 @@
     /* Constructor/destructor: */
     UIRuntimeMiniToolBar(QWidget *pParent,
-                         IntegrationMode integrationMode,
+                         GeometryType geometryType,
                          Qt::Alignment alignment,
                          bool fAutoHide = true);
@@ -78 +78 @@
     /* API: Alignment stuff: */
     void setAlignment(Qt::Alignment alignment);
-
-    /* API: Integration mode stuff: */
-    void setIntegrationMode(IntegrationMode integrationMode);
 
     /* API: Auto-hide stuff: */
@@ -127 +124 @@
     QPoint shownToolbarPosition() const { return m_shownToolbarPosition; }
 
-    /* Helper: Integration stuff: */
-    void integrate();
-
     /* Variables: General stuff: */
-    IntegrationMode m_integrationMode;
+    const GeometryType m_geometryType;
     Qt::Alignment m_alignment;
     bool m_fAutoHide;
@@ -175 +169 @@
     void setAlignment(Qt::Alignment alignment);
 
-    /* API: Integration mode stuff: */
-    void setIntegrationMode(IntegrationMode integrationMode);
-
     /* API: Auto-hide stuff: */
     bool autoHide() const;
@@ -207 +198 @@
     bool m_fPolished;
     Qt::Alignment m_alignment;
-    IntegrationMode m_integrationMode;
     QPainterPath m_shape;