Changeset 37610 in vbox for trunk/src

Timestamp:

Jun 23, 2011 12:26:14 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: 5748: Fixing GUI on KDE issue: Disappearing of page selector list in Global/Machine settings while opening for the first time.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QITreeWidget.cpp (modified) (2 diffs)
• extensions/QITreeWidget.h (modified) (1 diff)
• settings/VBoxSettingsSelector.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.cpp

@@ -28 +28 @@
     : QTreeWidget (aParent)
 {
+}
+
+void QITreeWidget::setSizeHintForItems(const QSize &sizeHint)
+{
+    for (int i = 0; i < topLevelItemCount(); ++i)
+        topLevelItem(i)->setSizeHint(0, sizeHint);
 }
 
@@ -60 +66 @@
 }
 
-void QITreeWidget::addTopBottomMarginToItems (int aMargin)
-{
-    for (int i = 0; i < topLevelItemCount(); ++ i)
-    {
-        QTreeWidgetItem *item = topLevelItem (i);
-        QSize s = item->sizeHint (0);
-        item->setSizeHint (0, QSize (s.width(), s.height() + 2 * aMargin));
-    }
-}
-

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.h

@@ -34 +34 @@
     QITreeWidget (QWidget *aParent = 0);
 
-    void addTopBottomMarginToItems (int aMargin);
+    void setSizeHintForItems(const QSize &sizeHint);
 
 signals:

trunk/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.cpp

@@ -285 +285 @@
 void VBoxSettingsTreeViewSelector::polish()
 {
-    mTwSelector->setFixedWidth (static_cast<QAbstractItemView*> (mTwSelector)
-        ->sizeHintForColumn (treeWidget_Category) + 2 * mTwSelector->frameWidth());
-
-    /* Sort selector by the id column */
-    mTwSelector->sortItems (treeWidget_Id, Qt::AscendingOrder);
-    mTwSelector->resizeColumnToContents (treeWidget_Category);
-
-    /* Add some margin to every item in the tree */
-    mTwSelector->addTopBottomMarginToItems (12);
+    /* Get recommended size hint: */
+    int iItemWidth = static_cast<QAbstractItemView*>(mTwSelector)->sizeHintForColumn(treeWidget_Category);
+    int iItemHeight = qMax(16 /* icon height */, mTwSelector->fontMetrics().height() /* text height */);
+    /* Add some margin to every item in the tree: */
+    iItemHeight += 4 /* margin itself */ * 2 /* margin count */;
+    /* Set final size hint for items: */
+    mTwSelector->setSizeHintForItems(QSize(iItemWidth , iItemHeight));
+
+    /* Fix selector width to minimum possible: */
+    mTwSelector->setFixedWidth(iItemWidth + 2 * mTwSelector->frameWidth());
+
+    /* Sort selector by the id column: */
+    mTwSelector->sortItems(treeWidget_Id, Qt::AscendingOrder);
+
+    /* Resize column(s) to content: */
+    mTwSelector->resizeColumnToContents(treeWidget_Category);
 }