Changeset 97663 in vbox for trunk/src/VBox

Timestamp:

Nov 23, 2022 9:33:48 AM (2 years ago)

Author:

vboxsync

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

154717

Message:

FE/Qt: bugref:10326: Bugfix for UIGraphicsScrollArea on macOS; When scrollbars set to be always visible on macOS, we should take their geometry into account only if they are visible indeed.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics

Files:

• UIGraphicsScrollArea.cpp (modified) (2 diffs)
• UIGraphicsScrollArea.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsScrollArea.cpp

@@ -287 +287 @@
 void UIGraphicsScrollArea::layoutWidgets()
 {
-    layoutViewport();
-    layoutScrollBar();
-}
-
-void UIGraphicsScrollArea::layoutViewport()
-{
-    if (m_pViewport)
-    {
-        switch (m_enmOrientation)
-        {
-            case Qt::Horizontal:
-            {
-                /* Align viewport and shift it horizontally: */
-                if (m_fAutoHideMode)
-                    m_pViewport->resize(m_pViewport->minimumSizeHint().width(), size().height());
-                else
-                    m_pViewport->resize(m_pViewport->minimumSizeHint().width(), size().height() - m_pScrollBar->minimumSizeHint().height());
-                m_pViewport->setPos(-m_pScrollBar->value(), 0);
-                break;
-            }
-            case Qt::Vertical:
-            {
-                /* Align viewport and shift it vertically: */
-                if (m_fAutoHideMode)
-                    m_pViewport->resize(size().width(), m_pViewport->minimumSizeHint().height());
-                else
-                    m_pViewport->resize(size().width() - m_pScrollBar->minimumSizeHint().width(), m_pViewport->minimumSizeHint().height());
-                m_pViewport->setPos(0, -m_pScrollBar->value());
-                break;
-            }
-        }
-    }
-}
-
-void UIGraphicsScrollArea::layoutScrollBar()
-{
     switch (m_enmOrientation)
     {
@@ -361 +325 @@
     }
 
-    /* Make scroll-bar visible only when there is viewport and maximum less than minimum: */
+    /* Make scroll-bar visible only when there is viewport and maximum more than minimum: */
     m_pScrollBar->setVisible(m_pViewport && m_pScrollBar->maximum() > m_pScrollBar->minimum());
-}
+
+    if (m_pViewport)
+    {
+        switch (m_enmOrientation)
+        {
+            case Qt::Horizontal:
+            {
+                /* Calculate geometry deduction: */
+                const int iDeduction = !m_fAutoHideMode && m_pScrollBar->isVisible() ? m_pScrollBar->minimumSizeHint().height() : 0;
+                /* Align viewport and shift it horizontally: */
+                m_pViewport->resize(m_pViewport->minimumSizeHint().width(), size().height() - iDeduction);
+                m_pViewport->setPos(-m_pScrollBar->value(), 0);
+                break;
+            }
+            case Qt::Vertical:
+            {
+                /* Calculate geometry deduction: */
+                const int iDeduction = !m_fAutoHideMode && m_pScrollBar->isVisible() ? m_pScrollBar->minimumSizeHint().width() : 0;
+                /* Align viewport and shift it vertically: */
+                m_pViewport->resize(size().width() - iDeduction, m_pViewport->minimumSizeHint().height());
+                m_pViewport->setPos(0, -m_pScrollBar->value());
+                break;
+            }
+        }
+    }
+}

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsScrollArea.h

@@ -92 +92 @@
     /** Layout widgets. */
     void layoutWidgets();
-    /** Layout viewport. */
-    void layoutViewport();
-    /** Layout scroll-bar. */
-    void layoutScrollBar();
 
     /** Holds the orientation. */