Changeset 52872 in vbox

Timestamp:

Sep 26, 2014 4:47:20 PM (10 years ago)

Author:

vboxsync

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

96296

Message:

FE/Qt: Runtime UI: Mini-toolbar rework 01.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIMiniToolBar.cpp (modified) (4 diffs)
• UIMiniToolBar.h (modified) (1 diff)

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

@@ -169 +169 @@
 
     /* Recalculate auto-hide animation: */
-    updateAutoHideAnimationBounds();
+    m_shownToolbarPosition = m_pEmbeddedToolbar->pos();
+    switch (m_alignment)
+    {
+        case Qt::AlignTop:
+            m_hiddenToolbarPosition = m_shownToolbarPosition - QPoint(0, m_pEmbeddedToolbar->height() - 3);
+            break;
+        case Qt::AlignBottom:
+            m_hiddenToolbarPosition = m_shownToolbarPosition + QPoint(0, m_pEmbeddedToolbar->height() - 3);
+            break;
+    }
+    m_pAnimation->update();
 
     /* Update toolbar geometry if necessary: */
@@ -246 +256 @@
     {
         /* Allow any MDI area size: */
-        m_pMdiArea->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
+        m_pMdiArea->setMinimumSize(QSize(1, 1));
         /* Configure own background: */
         QPalette pal = m_pMdiArea->palette();
@@ -374 +384 @@
 }
 
-void UIRuntimeMiniToolBar::updateAutoHideAnimationBounds()
-{
-    /* Update animation: */
-    m_shownToolbarPosition = m_pEmbeddedToolbar->pos();
-    switch (m_alignment)
-    {
-        case Qt::AlignTop:
-            m_hiddenToolbarPosition = m_shownToolbarPosition - QPoint(0, m_pEmbeddedToolbar->height() - 3);
-            break;
-        case Qt::AlignBottom:
-            m_hiddenToolbarPosition = m_shownToolbarPosition + QPoint(0, m_pEmbeddedToolbar->height() - 3);
-            break;
-    }
-    m_pAnimation->update();
-}
-
 void UIRuntimeMiniToolBar::simulateToolbarAutoHiding()
 {
@@ -411 +405 @@
 
 #ifdef Q_WS_X11
-    /* The setMask functionality is excessive under Win/Mac hosts
-     * because there is a Qt composition works properly,
-     * Mac host has native translucency support,
-     * Win host allows to enable it through Qt::WA_TranslucentBackground: */
+    /* Update window mask: */
     setMask(m_pEmbeddedToolbar->geometry());
 

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

@@ -124 +124 @@
 
     /* Helper: Hover stuff: */
-    void updateAutoHideAnimationBounds();
     void simulateToolbarAutoHiding();