Changeset 74118 in vbox for trunk

Timestamp:

Sep 6, 2018 1:41:10 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager UI: Details pane re-styling: Close/open animation fix for Element item.

Location:

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

Files:

• UIDetailsElement.cpp (modified) (1 diff)
• UIDetailsElement.h (modified) (3 diffs)
• UIDetailsSet.cpp (modified) (1 diff)

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

@@ -696 +696 @@
     pPainter->save();
 
+    /* Prepare variables: */
+    const int iMargin = data(ElementData_Margin).toInt();
+    const int iHeadHeight = 2 * iMargin + m_iMinimumHeaderHeight;
+    const QRect optionRect = pOptions->rect;
+    const QRect fullRect = m_fAnimationRunning
+                         ? QRect(optionRect.topLeft(), QSize(optionRect.width(), iHeadHeight + m_iAdditionalHeight))
+                         : optionRect;
+
     /* Paint frame: */
-    const QPalette pal = palette();
-    const QColor frameColor = pal.color(QPalette::Active, QPalette::Mid);
+    const QColor frameColor = palette().color(QPalette::Active, QPalette::Mid);
     pPainter->setPen(frameColor.lighter(m_iLightnessToneStart));
-    pPainter->drawRect(pOptions->rect);
+    pPainter->drawRect(fullRect);
 
     /* Restore painter: */

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

@@ -99 +99 @@
         bool isOpened() const { return !m_fClosed; }
 
+        /** Returns whether toggle animation is running. */
+        bool isAnimationRunning() const { return m_fAnimationRunning; }
         /** Marks animation finished. */
         void markAnimationFinished();
@@ -142 +144 @@
         virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *pEvent) /* override */;
 
-        virtual void paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, QWidget *pWidget = 0) /* override */;
+        /** Performs painting using passed @a pPainter, @a pOptions and optionally specified @a pWidget. */
+        virtual void paint(QPainter *pPainter, const QStyleOptionGraphicsItem *pOptions, QWidget *pWidget = 0) /* override */;
     /** @} */
 
@@ -165 +168 @@
         /** Returns toggle button instance. */
         UIGraphicsRotatorButton *button() const { return m_pButton; }
-        /** Returns whether toggle animation is running. */
-        bool isAnimationRunning() const { return m_fAnimationRunning; }
 
         /** Returns abstractly stored data value for certain @a iKey. */

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

@@ -345 +345 @@
                 /* Acquire required height: */
                 int iHeight = pElement->minimumHeightHint();
-                if (pElement->elementType() == DetailsElementType_System)
+                if (pElement->elementType() == DetailsElementType_System && !pElement->isAnimationRunning() && !pElement->isClosed())
                     if (UIDetailsElement *pPreviewElement = element(DetailsElementType_Preview))
                         if (pPreviewElement->isVisible())