Changeset 77268 in vbox

Timestamp:

Feb 11, 2019 4:40:49 PM (6 years ago)

Author:

vboxsync

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

128777

Message:

FE/Qt: bugref:9373: macOS: No buttons for UIGraphicsScrollBar on macOS, it's not a part of style there.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsScrollBar.cpp (modified) (10 diffs)

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

@@ -390 +390 @@
         {
             /* We have to calculate the X coord of the token, leaving Y untouched: */
+#ifdef VBOX_WS_MAC
+            const int iMin = 0;
+            const int iMax = size().width() - m_iExtent;
+#else
             const int iMin = m_iExtent;
             const int iMax = size().width() - 2 * m_iExtent;
+#endif
             int iX = pos.x() - m_iExtent / 2;
             iX = qMax(iX, iMin);
@@ -402 +407 @@
         {
             /* We have to calculate the Y coord of the token, leaving X untouched: */
+#ifdef VBOX_WS_MAC
+            const int iMin = 0;
+            const int iMax = size().height() - m_iExtent;
+#else
             const int iMin = m_iExtent;
             const int iMax = size().height() - 2 * m_iExtent;
+#endif
             int iY = pos.y() - m_iExtent / 2;
             iY = qMax(iY, iMin);
@@ -421 +431 @@
 void UIGraphicsScrollBar::sltStateLeftDefault()
 {
-    m_pButton1->hide();
-    m_pButton2->hide();
-    m_pToken->hide();
+    if (m_pButton1)
+        m_pButton1->hide();
+    if (m_pButton2)
+        m_pButton2->hide();
+    if (m_pToken)
+        m_pToken->hide();
 }
 
 void UIGraphicsScrollBar::sltStateLeftHovered()
 {
-    m_pButton1->hide();
-    m_pButton2->hide();
-    m_pToken->hide();
+    if (m_pButton1)
+        m_pButton1->hide();
+    if (m_pButton2)
+        m_pButton2->hide();
+    if (m_pToken)
+        m_pToken->hide();
 }
 
 void UIGraphicsScrollBar::sltStateEnteredDefault()
 {
-    m_pButton1->hide();
-    m_pButton2->hide();
-    m_pToken->hide();
+    if (m_pButton1)
+        m_pButton1->hide();
+    if (m_pButton2)
+        m_pButton2->hide();
+    if (m_pToken)
+        m_pToken->hide();
 }
 
 void UIGraphicsScrollBar::sltStateEnteredHovered()
 {
-    m_pButton1->show();
-    m_pButton2->show();
-    m_pToken->show();
+    if (m_pButton1)
+        m_pButton1->show();
+    if (m_pButton2)
+        m_pButton2->show();
+    if (m_pToken)
+        m_pToken->show();
 }
 
@@ -469 +491 @@
 void UIGraphicsScrollBar::prepareButtons()
 {
+#ifndef VBOX_WS_MAC
     /* Create buttons depending on orientation: */
     switch (m_enmOrientation)
@@ -504 +527 @@
                 this, &UIGraphicsScrollBar::sltButton2Clicked);
     }
+#endif
 }
 
@@ -591 +615 @@
     /* Make sure extent value is not smaller than the button size: */
     m_iExtent = QApplication::style()->pixelMetric(QStyle::PM_ScrollBarExtent);
+#ifndef VBOX_WS_MAC
     m_iExtent = qMax(m_iExtent, (int)m_pButton1->minimumSizeHint().width());
     m_iExtent = qMax(m_iExtent, (int)m_pButton2->minimumSizeHint().width());
+#endif
     updateGeometry();
 }
@@ -604 +630 @@
 void UIGraphicsScrollBar::layoutButtons()
 {
+#ifndef VBOX_WS_MAC
     // WORKAROUND:
     // We are calculating proper button shift delta, because
@@ -617 +644 @@
         iDelta2 = (m_iExtent - m_pButton2->minimumSizeHint().width() + 1) / 2;
     m_pButton2->setPos(size().width() - m_iExtent + iDelta2, size().height() - m_iExtent + iDelta2);
+#endif
 }
 
@@ -638 +666 @@
         {
             /* We have to adjust the X coord of the token, leaving Y unchanged: */
+#ifdef VBOX_WS_MAC
+            const int iMin = 0;
+            const int iMax = size().width() - m_iExtent;
+#else
             const int iMin = m_iExtent;
             const int iMax = size().width() - 2 * m_iExtent;
+#endif
             int iX = dRatio * (iMax - iMin) + iMin;
             position = QPoint(iX, 0);
@@ -647 +680 @@
         {
             /* We have to adjust the Y coord of the token, leaving X unchanged: */
+#ifdef VBOX_WS_MAC
+            const int iMin = 0;
+            const int iMax = size().height() - m_iExtent;
+#else
             const int iMin = m_iExtent;
             const int iMax = size().height() - 2 * m_iExtent;
+#endif
             int iY = dRatio * (iMax - iMin) + iMin;
             position = QPoint(0, iY);