Changeset 89162 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 19, 2021 12:52:49 PM (4 years ago)

Author:

vboxsync

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

144503

Message:

FE/Qt: bugref:10003: Chooser/Details panes model layout adjustments.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• chooser/UIChooserModel.cpp (modified) (1 diff)
• details/UIDetailsModel.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -1054 +1054 @@
 void UIChooserModel::updateLayout()
 {
-    if (!view() || !root())
-        return;
-
     /* Initialize variables: */
+    AssertPtrReturnVoid(view());
+    AssertPtrReturnVoid(root());
     const QSize viewportSize = view()->size();
     const int iViewportWidth = viewportSize.width();
-    const int iViewportHeight = viewportSize.height();
-
-    /* Set root-item position: */
+    const int iViewportHeight = root()->minimumSizeHint().toSize().height();
+
+    /* Move root: */
     root()->setPos(0, 0);
-    /* Set root-item size: */
+    /* Resize root: */
     root()->resize(iViewportWidth, iViewportHeight);
-    /* Relayout root-item: */
+    /* Layout root content: */
     root()->updateLayout();
-    /* Make sure root-item is shown: */
-    root()->show();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsModel.cpp

@@ -91 +91 @@
 void UIDetailsModel::updateLayout()
 {
-    /* Prepare variables: */
-    const QSize viewportSize = paintDevice()->viewport()->size();
-    const QSize rootSize = viewportSize.expandedTo(m_pRoot->minimumSizeHint().toSize());
+    /* Initialize variables: */
+    AssertPtrReturnVoid(view());
+    AssertPtrReturnVoid(root());
+    const QSize viewportSize = view()->size();
+    const int iViewportWidth = viewportSize.width();
+    const int iViewportHeight = root()->minimumSizeHint().toSize().height();
 
     /* Move root: */
-    m_pRoot->setPos(0, 0);
+    root()->setPos(0, 0);
     /* Resize root: */
-    m_pRoot->resize(rootSize);
+    root()->resize(iViewportWidth, iViewportHeight);
     /* Layout root content: */
-    m_pRoot->updateLayout();
+    root()->updateLayout();
 }