Changeset 44051 in vbox

Timestamp:

Dec 6, 2012 2:04:04 PM (12 years ago)

Author:

vboxsync

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

82522

Message:

FE/Qt: VM group UI: Chooser-view: Precise scene rectangle calculation.

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) (3 diffs)
• UIGChooserView.h (modified) (2 diffs)

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

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

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

@@ -40 +40 @@
     , m_pParent(pParent)
     , m_iPreviousMinimumWidthHint(0)
+    , m_iPreviousMinimumHeightHint(0)
     , m_dragTokenPlace(DragToken_Off)
     , m_fHovered(false)
@@ -176 +177 @@
             emit sigMinimumWidthHintChanged(m_iPreviousMinimumWidthHint);
         }
+        /* Root-item should notify chooser-view if minimum-height-hint was changed: */
+        int iMinimumHeightHint = minimumHeightHint();
+        if (m_iPreviousMinimumHeightHint != iMinimumHeightHint)
+        {
+            /* Save new minimum-height-hint, notify listener: */
+            m_iPreviousMinimumHeightHint = iMinimumHeightHint;
+            emit sigMinimumHeightHintChanged(m_iPreviousMinimumHeightHint);
+        }
     }
 }

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

@@ -68 +68 @@
 signals:
 
-    /* Notifier: Layout stuff: */
+    /* Notifiers: Size-hint stuff: */
     void sigMinimumWidthHintChanged(int iMinimumWidthHint);
+    void sigMinimumHeightHintChanged(int iMinimumHeightHint);
 
     /* Notifiers: Hover stuff: */
@@ -193 +194 @@
     QRectF m_previousGeometry;
     int m_iPreviousMinimumWidthHint;
+    int m_iPreviousMinimumHeightHint;
     DragToken m_dragTokenPlace;
 

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

@@ -54 +54 @@
     retranslateUi();
 
-    /* Prepare connections: */
+    /* Prepare main-root-item connections: */
     connect(this, SIGNAL(sigMinimumWidthHintChanged(int)),
             model(), SIGNAL(sigRootItemMinimumWidthHintChanged(int)));
+    connect(this, SIGNAL(sigMinimumHeightHintChanged(int)),
+            model(), SIGNAL(sigRootItemMinimumHeightHintChanged(int)));
 
     /* Init: */

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

@@ -176 +176 @@
     /* Make sure root-item is shown: */
     root()->show();
-    /* Notify listener about root-item relayouted: */
-    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);
     void sigRootItemMinimumWidthHintChanged(int iRootItemMinimumWidthHint);
+    void sigRootItemMinimumHeightHintChanged(int iRootItemMinimumHeightHint);
     void sigSlidingStarted();
 

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

@@ -27 +27 @@
 UIGChooserView::UIGChooserView(QWidget *pParent)
     : QGraphicsView(pParent)
+    , m_iMinimumWidthHint(0)
+    , m_iMinimumHeightHint(0)
 {
     /* Setup frame: */
     setFrameShape(QFrame::NoFrame);
     setFrameShadow(QFrame::Plain);
+    setAlignment(Qt::AlignLeft | Qt::AlignTop);
 
     /* Setup scroll-bars policy: */
@@ -39 +42 @@
 }
 
-void UIGChooserView::sltHandleRootItemResized(const QSizeF &size)
+void UIGChooserView::sltMinimumWidthHintChanged(int iMinimumWidthHint)
 {
+    /* Is there something changed? */
+    if (m_iMinimumWidthHint == iMinimumWidthHint)
+        return;
+
+    /* Remember new value: */
+    m_iMinimumWidthHint = iMinimumWidthHint;
+
+    /* Set minimum view width according passed width-hint: */
+    setMinimumWidth(2 * frameWidth() + iMinimumWidthHint + verticalScrollBar()->sizeHint().width());
+
     /* Update scene-rect: */
-    updateSceneRect(size);
+    updateSceneRect();
 }
 
-void UIGChooserView::sltHandleRootItemMinimumWidthHintChanged(int iRootItemMinimumWidthHint)
+void UIGChooserView::sltMinimumHeightHintChanged(int iMinimumHeightHint)
 {
-    /* Set minimum view width according to root-item minimum-width-hint: */
-    setMinimumWidth(2 * frameWidth() + iRootItemMinimumWidthHint + verticalScrollBar()->sizeHint().width());
+    /* Is there something changed? */
+    if (m_iMinimumHeightHint == iMinimumHeightHint)
+        return;
+
+    /* Remember new value: */
+    m_iMinimumHeightHint = iMinimumHeightHint;
+
+    /* Update scene-rect: */
+    updateSceneRect();
 }
 
@@ -71 +91 @@
 }
 
-void UIGChooserView::updateSceneRect(const QSizeF &sizeHint /* = QSizeF() */)
+void UIGChooserView::updateSceneRect()
 {
-    QPointF topLeft = QPointF(0, 0);
-    QSizeF rectSize = viewport()->size();
-    if (!sizeHint.isNull())
-        rectSize = rectSize.expandedTo(sizeHint);
-    setSceneRect(QRectF(topLeft, rectSize));
+    setSceneRect(0, 0, m_iMinimumWidthHint, m_iMinimumHeightHint);
 }
 

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

@@ -43 +43 @@
 private slots:
 
-    /* Handlers: Root-item stuff: */
-    void sltHandleRootItemResized(const QSizeF &size);
-    void sltHandleRootItemMinimumWidthHintChanged(int iRootItemMinimumWidthHint);
+    /* Handlers: Size-hint stuff: */
+    void sltMinimumWidthHintChanged(int iMinimumWidthHint);
+    void sltMinimumHeightHintChanged(int iMinimumHeightHint);
 
     /* Handler: Focus-item stuff: */
@@ -56 +56 @@
 
     /* Helper: Update stuff: */
-    void updateSceneRect(const QSizeF &sizeHint = QSizeF());
+    void updateSceneRect();
+
+    /* Variables: */
+    int m_iMinimumWidthHint;
+    int m_iMinimumHeightHint;
 };