Changeset 43990 in vbox

Timestamp:

Nov 28, 2012 4:49:12 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM group UI: Details-view: More strict viewport space calculation.

Location:

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

Files:

• UIGDetails.cpp (modified) (1 diff)
• UIGDetailsModel.cpp (modified) (1 diff)
• UIGDetailsModel.h (modified) (1 diff)
• UIGDetailsView.cpp (modified) (3 diffs)
• UIGDetailsView.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetails.cpp

@@ -91 +91 @@
 {
     /* Setup details-model connections: */
-    connect(m_pDetailsModel, SIGNAL(sigRootItemResized(const QSizeF&, int)),
-            m_pDetailsView, SLOT(sltHandleRootItemResized(const QSizeF&, int)));
+    connect(m_pDetailsModel, SIGNAL(sigRootMinimumSizeHintChanged(const QSizeF&)),
+            m_pDetailsView, SLOT(sltHandleRootItemMinimumSizeHintChanged(const QSizeF&)));
     connect(m_pDetailsModel, SIGNAL(sigLinkClicked(const QString&, const QString&, const QString&)),
             this, SIGNAL(sigLinkClicked(const QString&, const QString&, const QString&)));

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsModel.cpp

@@ -87 +87 @@
     m_pRoot->updateLayout();
 
-    /* Notify listener about root-item relayouted: */
-    emit sigRootItemResized(m_pRoot->geometry().size(), m_pRoot->minimumSizeHint().toSize().width());
+    /* Notify view about root minimum-size-hint changed: */
+    emit sigRootMinimumSizeHintChanged(m_pRoot->minimumSizeHint());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsModel.h

@@ -50 +50 @@
 
     /* Notifier: Root-item stuff: */
-    void sigRootItemResized(const QSizeF &size, int iMinimumWidth);
+    void sigRootMinimumSizeHintChanged(const QSizeF &minimumSizeHint);
 
     /* Notifier: Link processing stuff: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsView.cpp

@@ -35 +35 @@
     setFrameShape(QFrame::NoFrame);
     setFrameShadow(QFrame::Plain);
+    setAlignment(Qt::AlignLeft | Qt::AlignTop);
 
     /* Setup scroll-bars policy: */
@@ -43 +44 @@
 }
 
-void UIGDetailsView::sltHandleRootItemResized(const QSizeF &size, int iMinimumWidth)
+void UIGDetailsView::sltHandleRootItemMinimumSizeHintChanged(const QSizeF &minimumSizeHint)
 {
     /* Update scene-rect: */
-    updateSceneRect(size);
+    updateSceneRect(minimumSizeHint);
 
-    /* Set minimum width: */
-    setMinimumWidth(2 * frameWidth() + iMinimumWidth +
+    /* Set minimum-width: */
+    setMinimumWidth(2 * frameWidth() +
+                    minimumSizeHint.width() +
                     verticalScrollBar()->sizeHint().width());
 }
@@ -69 +71 @@
 }
 
-void UIGDetailsView::updateSceneRect(const QSizeF &sizeHint /* = QSizeF() */)
+void UIGDetailsView::updateSceneRect(const QSizeF &minimumSizeHint /* = QSizeF() */)
 {
     QPointF topLeft = QPointF(0, 0);
     QSizeF rectSize = viewport()->size();
-    if (!sizeHint.isNull())
-        rectSize = rectSize.expandedTo(sizeHint);
+    if (!minimumSizeHint.isNull())
+        rectSize.setHeight(minimumSizeHint.height());
     setSceneRect(QRectF(topLeft, rectSize));
 }

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsView.h

@@ -41 +41 @@
 
     /* Handler: Root-item stuff: */
-    void sltHandleRootItemResized(const QSizeF &size, int iMinimumWidth);
+    void sltHandleRootItemMinimumSizeHintChanged(const QSizeF &minimumSizeHint);
 
 private:
@@ -52 +52 @@
 
     /* Helper: Update stuff: */
-    void updateSceneRect(const QSizeF &sizeHint = QSizeF());
+    void updateSceneRect(const QSizeF &minimumSizeHint = QSizeF());
 };