Changeset 60524 in vbox

Timestamp:

Apr 15, 2016 5:51:31 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

106648

Message:

FE/Qt: ​bugref:8305: Selector UI: Chooser-pane: Group minimum size hint issue fixes:

1. Reset minimum size hint for 'non-root' group items to exclude their influence onto Chooser-pane;
2. Keep 'root' group item status and geometry actual on group sliding transactions;
3. Listen for size hint change signals of any sub-group, not just the main group.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser

Files:

• UIGChooserItem.cpp (modified) (1 diff)
• UIGChooserItem.h (modified) (1 diff)
• UIGChooserItemGroup.cpp (modified) (2 diffs)
• UIGChooserModel.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItem.cpp

@@ -343 +343 @@
 }
 
+void UIGChooserItem::handleRootStatusChange()
+{
+    /* Reset minimum size hints for non-root items: */
+    if (!isRoot())
+    {
+        m_iPreviousMinimumWidthHint = 0;
+        m_iPreviousMinimumHeightHint = 0;
+    }
+}
+
 /* static */
 void UIGChooserItem::configurePainterShape(QPainter *pPainter,

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItem.h

@@ -158 +158 @@
 
     /* Helper: Update stuff: */
-    virtual void handleRootStatusChange() {}
+    virtual void handleRootStatusChange();
     void setPreviousGeometry(const QRectF &previousGeometry) { m_previousGeometry = previousGeometry; }
     const QRectF& previousGeometry() const { return m_previousGeometry; }

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.cpp

@@ -120 +120 @@
     updateVisibleName();
     updateToolTip();
+
+    /* Prepare root-item connections: */
+    connect(this, SIGNAL(sigMinimumWidthHintChanged(int)),
+            model(), SIGNAL(sigRootItemMinimumWidthHintChanged(int)));
+    connect(this, SIGNAL(sigMinimumHeightHintChanged(int)),
+            model(), SIGNAL(sigRootItemMinimumHeightHintChanged(int)));
 }
 
@@ -457 +463 @@
 void UIGChooserItemGroup::handleRootStatusChange()
 {
+    /* Call to base-class: */
+    UIGChooserItem::handleRootStatusChange();
+
     /* Update linked values: */
     updateVisibleName();

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -463 +463 @@
 
     /* Indent root: */
+    root()->setRoot(false);
     m_rootStack << pNewRootItem;
     root()->setRoot(true);
@@ -499 +500 @@
     m_pAfterSlidingFocus = root();
     m_rootStack.removeLast();
+    root()->setRoot(true);
 
     /* Slide root: */
@@ -745 +747 @@
     /* We are no more sliding: */
     m_fSliding = false;
+
+    /* Update root geometry: */
+    root()->updateGeometry();
 
     /* Update model: */