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

Timestamp:

May 17, 2021 3:04:49 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10003: Reworking Details pane; More strict logic for opened/closed element state flag and forward/backward animation.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/details

Files:

• UIDetailsElement.cpp (modified) (3 diffs)
• UIDetailsElements.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp

@@ -218 +218 @@
     m_pButton->setPos(iButtonX, iButtonY);
 
-    /* If closed: */
-    if (isClosed())
-    {
-        /* Hide text-pane if still visible: */
-        if (m_pTextPane->isVisible())
-            m_pTextPane->hide();
-    }
-    /* If opened: */
-    else
-    {
-        /* Layout text-pane: */
-        int iTextPaneX = 2 * iMargin;
-        int iTextPaneY = iMargin + m_iMinimumHeaderHeight + 2 * iMargin;
-        m_pTextPane->setPos(iTextPaneX, iTextPaneY);
-        m_pTextPane->resize(size.width() - 4 * iMargin,
-                            size.height() - 4 * iMargin - m_iMinimumHeaderHeight);
-        /* Show text-pane if still invisible and animation finished: */
-        if (!m_pTextPane->isVisible() && !isAnimationRunning())
-            m_pTextPane->show();
-    }
+    /* If closed or animation running => hide: */
+    if ((isClosed() || isAnimationRunning()) && m_pTextPane->isVisible())
+        m_pTextPane->hide();
+    /* If opened and animation isn't running => show: */
+    else if (!isClosed() && !isAnimationRunning() && !m_pTextPane->isVisible())
+        m_pTextPane->show();
+
+    /* Layout text-pane: */
+    int iTextPaneX = 2 * iMargin;
+    int iTextPaneY = iMargin + m_iMinimumHeaderHeight + 2 * iMargin;
+    m_pTextPane->setPos(iTextPaneX, iTextPaneY);
+    m_pTextPane->resize(size.width() - 4 * iMargin,
+                        size.height() - 4 * iMargin - m_iMinimumHeaderHeight);
 }
 
@@ -444 +437 @@
 
     /* Additional height during animation: */
-    if (m_fAnimationRunning)
+    if (m_fAnimationRunning && isClosed())
         iMinimumHeightHint += m_iAdditionalHeight;
 
@@ -470 +463 @@
     updateAnimationParameters();
 
-    /* Invert toggle-state: */
-    m_fClosed = !m_fClosed;
+    /* Invert toggle-state instantly only for closed elements.
+     * Opened element being closed should remain opened
+     * until animation is fully finished. */
+    if (m_fClosed)
+        m_fClosed = !m_fClosed;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElements.cpp

@@ -145 +145 @@
 
     /* Show/hide preview: */
-    if (isClosed() && m_pPreview->isVisible())
+    if ((isClosed() || isAnimationRunning()) && m_pPreview->isVisible())
         m_pPreview->hide();
-    if (isOpened() && !m_pPreview->isVisible() && !isAnimationRunning())
+    if (!isClosed() && !isAnimationRunning() && !m_pPreview->isVisible())
         m_pPreview->show();
 
-    /* And update preview layout itself: */
+    /* Layout Preview: */
     const int iMargin = data(ElementData_Margin).toInt();
     m_pPreview->setPos(iMargin, 2 * iMargin + minimumHeaderHeight());