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

Timestamp:

May 17, 2021 2:58:15 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10003: Reworking Details pane; Make updateLayout() public again!

Location:

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

Files:

• UIDetailsElement.cpp (modified) (2 diffs)
• UIDetailsElement.h (modified) (2 diffs)
• UIDetailsElements.cpp (modified) (2 diffs)
• UIDetailsElements.h (modified) (2 diffs)

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

@@ -204 +204 @@
 }
 
+void UIDetailsElement::updateLayout()
+{
+    /* Prepare variables: */
+    QSize size = geometry().size().toSize();
+    int iMargin = data(ElementData_Margin).toInt();
+
+    /* Layout button: */
+    int iButtonWidth = m_buttonSize.width();
+    int iButtonHeight = m_buttonSize.height();
+    int iButtonX = size.width() - 2 * iMargin - iButtonWidth;
+    int iButtonY = iButtonHeight == m_iMinimumHeaderHeight ? iMargin :
+                   iMargin + (m_iMinimumHeaderHeight - iButtonHeight) / 2;
+    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();
+    }
+}
+
 int UIDetailsElement::minimumWidthHint() const
 {
@@ -385 +421 @@
 {
     AssertMsgFailed(("Details element do NOT support children!"));
-}
-
-void UIDetailsElement::updateLayout()
-{
-    /* Prepare variables: */
-    QSize size = geometry().size().toSize();
-    int iMargin = data(ElementData_Margin).toInt();
-
-    /* Layout button: */
-    int iButtonWidth = m_buttonSize.width();
-    int iButtonHeight = m_buttonSize.height();
-    int iButtonX = size.width() - 2 * iMargin - iButtonWidth;
-    int iButtonY = iButtonHeight == m_iMinimumHeaderHeight ? iMargin :
-                   iMargin + (m_iMinimumHeaderHeight - iButtonHeight) / 2;
-    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();
-    }
 }
 

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

@@ -112 +112 @@
     /** @name Layout stuff.
       * @{ */
+        /** Updates layout. */
+        virtual void updateLayout() /* override */;
+
         /** Returns minimum width-hint. */
         virtual int minimumWidthHint() const /* override */;
@@ -197 +200 @@
     /** @name Layout stuff.
       * @{ */
-        /** Updates layout. */
-        virtual void updateLayout() /* override */;
-
         /** Returns minimum width-hint for @a fClosed element. */
         virtual int minimumHeightHintForElement(bool fClosed) const;

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

@@ -139 +139 @@
 }
 
+void UIDetailsElementPreview::updateLayout()
+{
+    /* Call to base-class: */
+    UIDetailsElement::updateLayout();
+
+    /* Show/hide preview: */
+    if (isClosed() && m_pPreview->isVisible())
+        m_pPreview->hide();
+    if (isOpened() && !m_pPreview->isVisible() && !isAnimationRunning())
+        m_pPreview->show();
+
+    /* And update preview layout itself: */
+    const int iMargin = data(ElementData_Margin).toInt();
+    m_pPreview->setPos(iMargin, 2 * iMargin + minimumHeaderHeight());
+    m_pPreview->resize(m_pPreview->minimumSizeHint());
+}
+
 void UIDetailsElementPreview::sltPreviewSizeHintChanged()
 {
@@ -202 +219 @@
 }
 
-void UIDetailsElementPreview::updateLayout()
-{
-    /* Call to base-class: */
-    UIDetailsElement::updateLayout();
-
-    /* Show/hide preview: */
-    if (isClosed() && m_pPreview->isVisible())
-        m_pPreview->hide();
-    if (isOpened() && !m_pPreview->isVisible() && !isAnimationRunning())
-        m_pPreview->show();
-
-    /* And update preview layout itself: */
-    const int iMargin = data(ElementData_Margin).toInt();
-    m_pPreview->setPos(iMargin, 2 * iMargin + minimumHeaderHeight());
-    m_pPreview->resize(m_pPreview->minimumSizeHint());
-}
-
 void UIDetailsElementPreview::updateAppearance()
 {

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

@@ -91 +91 @@
     UIDetailsElementPreview(UIDetailsSet *pParent, bool fOpened);
 
+    /** Updates layout. */
+    virtual void updateLayout() /* override */;
+
 private slots:
 
@@ -107 +110 @@
       *                be calculated for the closed element. */
     int minimumHeightHintForElement(bool fClosed) const;
-    /** Updates layout. */
-    void updateLayout();
 
     /** Updates appearance. */