Changeset 106050 in vbox

Timestamp:

Sep 13, 2024 3:35:01 PM (3 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10513: VM Settings / Storage page: Adjusting many layout aspects to avoid widgets/layouts jumping around while switching between controllers and various types of attachments.

File:

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

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

@@ -827 +827 @@
     /** 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;
 };
 
@@ -2846 +2827 @@
 
     drawFocus(pPainter, option, rect);
-}
-
-
-/*********************************************************************************************************************************
-*   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);
 }
 
@@ -4608 +4526 @@
         if (m_pLabelSeparatorLeftPane)
             m_pLabelSeparatorLeftPane->setBuddy(m_pTreeViewStorage);
+        m_pTreeViewStorage->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::MinimumExpanding);
+        m_pTreeViewStorage->setMinimumHeight(150);
         m_pTreeViewStorage->setMouseTracking(true);
         m_pTreeViewStorage->setAcceptDrops(true);
@@ -4785 +4705 @@
 {
     /* Create widget for controller case: */
-    UIWidgetOfMaximumSize *pWidgetController = new UIWidgetOfMaximumSize;
+    QWidget *pWidgetController = new QWidget;
     if (pWidgetController)
     {
@@ -4864 +4784 @@
 {
     /* Create widget for attachment case: */
-    UIWidgetOfMaximumSize *pWidgetAttachment = new UIWidgetOfMaximumSize;
+    QWidget *pWidgetAttachment = new QWidget;
     if (pWidgetAttachment)
     {
@@ -5079 +4999 @@
             if (m_pLabelCDType)
             {
+                m_pLabelCDType->hide();
                 m_pLabelCDType->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
                 m_pLayoutAttachment->addWidget(m_pLabelCDType, 12, 1);
@@ -5086 +5007 @@
             if (m_pFieldCDType)
             {
+                m_pFieldCDType->hide();
                 m_pFieldCDType->setFullSizeSelection(true);
                 m_pFieldCDType->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum));
@@ -5095 +5017 @@
             if (m_pLabelCDSize)
             {
+                m_pLabelCDSize->hide();
                 m_pLabelCDSize->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
                 m_pLayoutAttachment->addWidget(m_pLabelCDSize, 13, 1);
@@ -5102 +5025 @@
             if (m_pFieldCDSize)
             {
+                m_pFieldCDSize->hide();
                 m_pFieldCDSize->setFullSizeSelection(true);
                 m_pFieldCDSize->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum));
@@ -5111 +5035 @@
             if (m_pLabelCDLocation)
             {
+                m_pLabelCDLocation->hide();
                 m_pLabelCDLocation->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
                 m_pLayoutAttachment->addWidget(m_pLabelCDLocation, 14, 1);
@@ -5118 +5043 @@
             if (m_pFieldCDLocation)
             {
+                m_pFieldCDLocation->hide();
                 m_pFieldCDLocation->setFullSizeSelection(true);
                 m_pFieldCDLocation->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum));
@@ -5127 +5053 @@
             if (m_pLabelCDUsage)
             {
+                m_pLabelCDUsage->hide();
                 m_pLabelCDUsage->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
                 m_pLayoutAttachment->addWidget(m_pLabelCDUsage, 15, 1);
@@ -5134 +5061 @@
             if (m_pFieldCDUsage)
             {
+                m_pFieldCDUsage->hide();
                 m_pFieldCDUsage->setFullSizeSelection(true);
                 m_pFieldCDUsage->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum));
@@ -5143 +5071 @@
             if (m_pLabelFDType)
             {
+                m_pLabelFDType->hide();
                 m_pLabelFDType->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
                 m_pLayoutAttachment->addWidget(m_pLabelFDType, 16, 1);
@@ -5150 +5079 @@
             if (m_pFieldFDType)
             {
+                m_pFieldFDType->hide();
                 m_pFieldFDType->setFullSizeSelection(true);
                 m_pFieldFDType->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum));
@@ -5159 +5089 @@
             if (m_pLabelFDSize)
             {
+                m_pLabelFDSize->hide();
                 m_pLabelFDSize->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
                 m_pLayoutAttachment->addWidget(m_pLabelFDSize, 17, 1);
@@ -5166 +5097 @@
             if (m_pFieldFDSize)
             {
+                m_pFieldFDSize->hide();
                 m_pFieldFDSize->setFullSizeSelection(true);
                 m_pFieldFDSize->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum));
@@ -5175 +5107 @@
             if (m_pLabelFDLocation)
             {
+                m_pLabelFDLocation->hide();
                 m_pLabelFDLocation->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
                 m_pLayoutAttachment->addWidget(m_pLabelFDLocation, 18, 1);
@@ -5182 +5115 @@
             if (m_pFieldFDLocation)
             {
+                m_pFieldFDLocation->hide();
                 m_pFieldFDLocation->setFullSizeSelection(true);
                 m_pFieldFDLocation->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum));
@@ -5191 +5125 @@
             if (m_pLabelFDUsage)
             {
+                m_pLabelFDUsage->hide();
                 m_pLabelFDUsage->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
                 m_pLayoutAttachment->addWidget(m_pLabelFDUsage, 19, 1);
@@ -5198 +5133 @@
             if (m_pFieldFDUsage)
             {
+                m_pFieldFDUsage->hide();
                 m_pFieldFDUsage->setFullSizeSelection(true);
                 m_pFieldFDUsage->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum));