Changeset 90333 in vbox

Timestamp:

Jul 26, 2021 1:00:19 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. UITooolBox minimum size hint fix.

Location:

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

Files:

• UIToolBox.cpp (modified) (5 diffs)
• UIToolBox.h (modified) (1 diff)

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

@@ -88 +88 @@
     int totalHeight() const;
     int titleHeight() const;
-    int pageWidgetHeight() const;
+    QSize pageWidgetSize() const;
     void setTitleIcon(const QIcon &icon, const QString &strToolTip);
 
@@ -268 +268 @@
 int UIToolBoxPage::totalHeight() const
 {
-    return pageWidgetHeight() + titleHeight();
+    return pageWidgetSize().height() + titleHeight();
 }
 
@@ -292 +292 @@
 }
 
-int UIToolBoxPage::pageWidgetHeight() const
-{
-    if (m_pWidget && m_pWidget->isVisible() && m_pWidget->sizeHint().isValid())
-        return m_pWidget->sizeHint().height();
-    return 0;
+QSize UIToolBoxPage::pageWidgetSize() const
+{
+    if (m_pWidget && m_pWidget->sizeHint().isValid())
+        return m_pWidget->sizeHint();
+    return QSize();
 }
 
@@ -376 +376 @@
             this, &UIToolBox::sltHandleShowPageWidget);
 
-    static int iMaxPageHeight = 0;
-    int iTotalTitleHeight = 0;
-    foreach(UIToolBoxPage *pPage, m_pages)
-    {
-        if (pWidget && pWidget->sizeHint().isValid())
-            iMaxPageHeight = qMax(iMaxPageHeight, pWidget->sizeHint().height());
-        iTotalTitleHeight += pPage->titleHeight();
-    }
-    setMinimumHeight(m_iPageCount * (qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin) +
-                                     qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin)) +
-                     iTotalTitleHeight +
-                     iMaxPageHeight);
     /* Add stretch at the end: */
     m_pMainLayout->addStretch();
@@ -393 +381 @@
 }
 
+QSize UIToolBox::minimumSizeHint() const
+{
+
+    int iMaxPageHeight = 0;
+    int iTotalTitleHeight = 0;
+    int iWidth = 0;
+    foreach(UIToolBoxPage *pPage, m_pages)
+    {
+        QSize pageWidgetSize(pPage->pageWidgetSize());
+        iMaxPageHeight = qMax(iMaxPageHeight, pageWidgetSize.height());
+        iTotalTitleHeight += pPage->titleHeight();
+        iWidth = qMax(pageWidgetSize.width(), iWidth);
+    }
+    int iHeight = m_iPageCount * (qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin) +
+                                  qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin)) +
+        iTotalTitleHeight +
+        iMaxPageHeight;
+    return QSize(iWidth, iHeight);
+}
+
 void UIToolBox::setPageEnabled(int iIndex, bool fEnabled)
 {

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

@@ -52 +52 @@
     void setPageTitleIcon(int iIndex, const QIcon &icon, const QString &strIconToolTip = QString());
     void setCurrentPage(int iIndex);
+    virtual QSize minimumSizeHint() const /* override */;
 
 protected: