Changeset 101333 in vbox for trunk/src/VBox

Timestamp:

Oct 3, 2023 2:40:43 PM (16 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10513: Layout adjustment for VM settings / Storage page; This one is more complex, it prevents page size-hint blinking while changing selection from controller to attachment every time.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.cpp

@@ -42 +42 @@
 #include <QMouseEvent>
 #include <QPainter>
+#include <QSizePolicy>
 #include <QSpinBox>
 #include <QStackedWidget>
@@ -818 +819 @@
     /** Holds the medium device type. */
     UIMediumDeviceType  m_enmType;
+};
+
+
+/** QWidget sub-class
+  * with manual size-hint recalculation.
+  * Tries to take into account size-hint even for hidden items.
+  * Assumes QGridLayout is present as this widget is used purely
+  * for controller/attachment pane. */
+class UIWidgetOfMaximumSize : public QWidget
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs widget passing @a pParent to base-class. */
+    UIWidgetOfMaximumSize(QWidget *pParent = 0);
+
+    /** Returns the minimum widget size. */
+    virtual QSize minimumSizeHint() const RT_OVERRIDE;
 };
 
@@ -2829 +2849 @@
 
 /*********************************************************************************************************************************
+*   Class UIWidgetOfMaximumSize implementation.                                                                                  *
+*********************************************************************************************************************************/
+
+UIWidgetOfMaximumSize::UIWidgetOfMaximumSize(QWidget *pParent /* = 0 */)
+    : QWidget(pParent)
+{
+}
+
+QSize UIWidgetOfMaximumSize::minimumSizeHint() const
+{
+    /* Assume there is just one grid-layout: */
+    QList<QGridLayout*> gridLayouts = findChildren<QGridLayout*>();
+    AssertReturn(gridLayouts.size() == 1, QWidget::minimumSizeHint());
+    QGridLayout *pLayout = gridLayouts.first();
+    AssertPtrReturn(pLayout, QWidget::minimumSizeHint());
+
+    /* Acquire layout spacing: */
+    const int iSpacing = pLayout->spacing();
+
+    /* Calcualte column widths: */
+    QList<int> columns(pLayout->columnCount());
+    for (int iColumn = 0; iColumn < pLayout->columnCount(); ++iColumn)
+        for (int iRow = 0; iRow < pLayout->rowCount(); ++iRow)
+        {
+            QLayoutItem *pItem = pLayout->itemAtPosition(iRow, iColumn);
+            if (!pItem)
+                continue;
+            if (QWidget *pWidget = pItem->widget())
+            {
+                const QSizePolicy sp = pWidget->sizePolicy();
+                if (sp.horizontalPolicy() != QSizePolicy::Ignored)
+                    columns[iColumn] = qMax(columns.at(iColumn), pWidget->minimumSizeHint().width());
+            }
+        }
+
+    /* Calcualte row heights: */
+    QList<int> rows(pLayout->rowCount());
+    for (int iRow = 0; iRow < pLayout->rowCount(); ++iRow)
+        for (int iColumn = 0; iColumn < pLayout->columnCount(); ++iColumn)
+        {
+            QLayoutItem *pItem = pLayout->itemAtPosition(iRow, iColumn);
+            if (!pItem)
+                continue;
+            if (QWidget *pWidget = pItem->widget())
+            {
+                const QSizePolicy sp = pWidget->sizePolicy();
+                if (sp.verticalPolicy() != QSizePolicy::Ignored)
+                    rows[iRow] = qMax(rows.at(iRow), pWidget->minimumSizeHint().height());
+            }
+        }
+
+    /* Calculate effective layout size: */
+    int iTotalWidth = 0;
+    for (int iColumn = 0; iColumn < columns.size(); ++iColumn)
+        iTotalWidth += columns.at(iColumn) + iSpacing;
+    int iTotalHeight = 0;
+    for (int iRow = 0; iRow < rows.size(); ++iRow)
+        iTotalHeight += rows.at(iRow) + iSpacing;
+    return QSize(iTotalWidth, iTotalHeight);
+}
+
+
+/*********************************************************************************************************************************
 *   Class UIStorageSettingsEditor implementation.                                                                                *
 *********************************************************************************************************************************/
@@ -4541 +4624 @@
 {
     /* Create widget for controller case: */
-    QWidget *pWidgetController = new QWidget;
+    UIWidgetOfMaximumSize *pWidgetController = new UIWidgetOfMaximumSize;
     if (pWidgetController)
     {
@@ -4620 +4703 @@
 {
     /* Create widget for attachment case: */
-    QWidget *pWidgetAttachment = new QWidget;
+    UIWidgetOfMaximumSize *pWidgetAttachment = new UIWidgetOfMaximumSize;
     if (pWidgetAttachment)
     {