Changeset 43957 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Nov 26, 2012 10:00:56 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM group UI: More strict chooser-view minimum-width-hint handling.

Location:

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

Files:

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

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

@@ -135 +135 @@
 {
     /* Setup chooser-model connections: */
-    connect(m_pChooserModel, SIGNAL(sigRootItemResized(const QSizeF&, int)),
-            m_pChooserView, SLOT(sltHandleRootItemResized(const QSizeF&, int)));
+    connect(m_pChooserModel, SIGNAL(sigRootItemResized(const QSizeF&)),
+            m_pChooserView, SLOT(sltHandleRootItemResized(const QSizeF&)));
+    connect(m_pChooserModel, SIGNAL(sigRootItemMinimumWidthHintChanged(int)),
+            m_pChooserView, SLOT(sltHandleRootItemMinimumWidthHintChanged(int)));
     connect(m_pChooserModel, SIGNAL(sigFocusChanged(UIGChooserItem*)),
             m_pChooserView, SLOT(sltFocusChanged(UIGChooserItem*)));

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

@@ -39 +39 @@
     , m_fTemporary(fTemporary)
     , m_pParent(pParent)
+    , m_iPreviousMinimumWidthHint(0)
     , m_dragTokenPlace(DragToken_Off)
     , m_fHovered(false)
@@ -163 +164 @@
     if (parentItem())
         parentItem()->updateGeometry();
+
+    /* Special handling for root-items: */
+    if (isRoot())
+    {
+        /* Root-item should notify chooser-view if minimum-width-hint was changed: */
+        int iMinimumWidthHint = minimumWidthHint();
+        if (m_iPreviousMinimumWidthHint != iMinimumWidthHint)
+        {
+            /* Save new minimum-width-hint, notify listener: */
+            m_iPreviousMinimumWidthHint = iMinimumWidthHint;
+            emit sigMinimumWidthHintChanged(m_iPreviousMinimumWidthHint);
+        }
+    }
 }
 

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

@@ -67 +67 @@
 
 signals:
+
+    /* Notifier: Layout stuff: */
+    void sigMinimumWidthHintChanged(int iMinimumWidthHint);
 
     /* Notifiers: Hover stuff: */
@@ -189 +192 @@
     UIGChooserItem *m_pParent;
     QRectF m_previousGeometry;
+    int m_iPreviousMinimumWidthHint;
     DragToken m_dragTokenPlace;
 

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

@@ -53 +53 @@
     /* Translate finally: */
     retranslateUi();
+
+    /* Prepare connections: */
+    connect(this, SIGNAL(sigMinimumWidthHintChanged(int)),
+            model(), SIGNAL(sigRootItemMinimumWidthHintChanged(int)));
 
     /* Init: */

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

@@ -177 +177 @@
     root()->show();
     /* Notify listener about root-item relayouted: */
-    emit sigRootItemResized(root()->geometry().size(), root()->minimumWidthHint());
+    emit sigRootItemResized(root()->geometry().size());
 }
 

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

@@ -74 +74 @@
 
     /* Notifiers: Root-item stuff: */
-    void sigRootItemResized(const QSizeF &size, int iMinimumWidth);
+    void sigRootItemResized(const QSizeF &size);
+    void sigRootItemMinimumWidthHintChanged(int iRootItemMinimumWidthHint);
     void sigSlidingStarted();
 

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

@@ -39 +39 @@
 }
 
-void UIGChooserView::sltHandleRootItemResized(const QSizeF &size, int iMinimumWidth)
+void UIGChooserView::sltHandleRootItemResized(const QSizeF &size)
 {
     /* Update scene-rect: */
     updateSceneRect(size);
+}
 
-    /* Set minimum width: */
-    setMinimumWidth(2 * frameWidth() + iMinimumWidth +
-                    verticalScrollBar()->sizeHint().width());
+void UIGChooserView::sltHandleRootItemMinimumWidthHintChanged(int iRootItemMinimumWidthHint)
+{
+    /* Set minimum view width according to root-item minimum-width-hint: */
+    setMinimumWidth(2 * frameWidth() + iRootItemMinimumWidthHint + verticalScrollBar()->sizeHint().width());
 }
 

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

@@ -43 +43 @@
 private slots:
 
-    /* Handler: Root-item stuff: */
-    void sltHandleRootItemResized(const QSizeF &size, int iMinimumWidth);
+    /* Handlers: Root-item stuff: */
+    void sltHandleRootItemResized(const QSizeF &size);
+    void sltHandleRootItemMinimumWidthHintChanged(int iRootItemMinimumWidthHint);
 
     /* Handler: Focus-item stuff: */