Changeset 95002 in vbox

Timestamp:

May 13, 2022 10:59:28 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt/Ds: QIToolBar: Hide branding text if button labels disabled as well.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIToolBar.cpp (modified) (3 diffs)
• extensions/QIToolBar.h (modified) (1 diff)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIToolBar.cpp

@@ -56 +56 @@
 }
 
+bool QIToolBar::useTextLabels() const
+{
+    /* Depending on parent, return the style: */
+    if (m_pMainWindow)
+        return m_pMainWindow->toolButtonStyle() == Qt::ToolButtonTextUnderIcon;
+    else
+        return toolButtonStyle() == Qt::ToolButtonTextUnderIcon;
+}
+
 #ifdef VBOX_WS_MAC
 void QIToolBar::enableMacToolbar()
@@ -140 +149 @@
         if (!m_icnBranding.isNull())
         {
-            /* Configure font to fit width (m_iBrandingWidth - 2 * 4): */
+            /* A bit of common stuff: */
             QFont fnt = font();
             int iTextWidth = 0;
-            for (int i = 0; i <= 10; ++i) // no more than 10 tries ..
+            int iTextHeight = 0;
+
+            /* Configure font to fit width (m_iBrandingWidth - 2 * 4): */
+            if (useTextLabels())
             {
-                if (fnt.pixelSize() == -1)
-                    fnt.setPointSize(fnt.pointSize() - i);
-                else
-                    fnt.setPixelSize(fnt.pixelSize() - i);
-                iTextWidth = QFontMetrics(fnt).size(0, m_strBranding).width();
-                if (iTextWidth <= m_iBrandingWidth - 2 * 4)
-                    break;
+                for (int i = 0; i <= 10; ++i) // no more than 10 tries ..
+                {
+                    if (fnt.pixelSize() == -1)
+                        fnt.setPointSize(fnt.pointSize() - i);
+                    else
+                        fnt.setPixelSize(fnt.pixelSize() - i);
+                    iTextWidth = QFontMetrics(fnt).size(0, m_strBranding).width();
+                    if (iTextWidth <= m_iBrandingWidth - 2 * 4)
+                        break;
+                }
+                iTextHeight = QFontMetrics(fnt).height();
             }
-            const int iFontHeight = QFontMetrics(fnt).height();
 
             /* Draw pixmap: */
             const int iIconSize = qMin(rectangle.height(), 32 /* default */);
             const int iIconMarginH = (m_iBrandingWidth - iIconSize) / 2;
-            const int iIconMarginV = (rectangle.height() - iIconSize - iFontHeight) / 2;
+            const int iIconMarginV = (rectangle.height() - iIconSize - iTextHeight) / 2;
             const int iIconX = rectangle.width() - iIconSize - iIconMarginH;
             const int iIconY = iIconMarginV;
@@ -164 +179 @@
 
             /* Draw text path: */
-            const int iTextMargingH = (m_iBrandingWidth - iTextWidth) / 2;
-            const int iTextX = rectangle.width() - iTextWidth - iTextMargingH;
-            const int iTextY = iIconY + iIconSize + iFontHeight;
-            QPainterPath textPath;
-            textPath.addText(0, 0, fnt, m_strBranding);
-            textPath.translate(iTextX, iTextY);
-            painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing);
-            painter.setPen(QPen(m_clrBranding.darker(80), 2, Qt::SolidLine, Qt::RoundCap));
-            painter.drawPath(QPainterPathStroker().createStroke(textPath));
-            painter.setBrush(Qt::black);
-            painter.setPen(Qt::NoPen);
-            painter.drawPath(textPath);
+            if (useTextLabels())
+            {
+                const int iTextMargingH = (m_iBrandingWidth - iTextWidth) / 2;
+                const int iTextX = rectangle.width() - iTextWidth - iTextMargingH;
+                const int iTextY = iIconY + iIconSize + iTextHeight;
+                QPainterPath textPath;
+                textPath.addText(0, 0, fnt, m_strBranding);
+                textPath.translate(iTextX, iTextY);
+                painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing);
+                painter.setPen(QPen(m_clrBranding.darker(80), 2, Qt::SolidLine, Qt::RoundCap));
+                painter.drawPath(QPainterPathStroker().createStroke(textPath));
+                painter.setBrush(Qt::black);
+                painter.setPen(Qt::NoPen);
+                painter.drawPath(textPath);
+            }
         }
     }

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIToolBar.h

@@ -57 +57 @@
     /** Defines whether tool-bar should use text-labels. */
     void setUseTextLabels(bool fEnable);
+    /** Returns whether tool-bar should use text-labels. */
+    bool useTextLabels() const;
 
 #ifdef VBOX_WS_MAC

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -309 +309 @@
     if (pResult == pShowToolBarText)
     {
-        m_pToolBar->setToolButtonStyle(  pResult->isChecked()
-                                       ? Qt::ToolButtonTextUnderIcon
-                                       : Qt::ToolButtonIconOnly);
+        m_pToolBar->setUseTextLabels(pResult->isChecked());
         gEDataManager->setSelectorWindowToolBarTextVisible(pResult->isChecked());
     }
@@ -632 +630 @@
                         m_pToolBar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
                         m_pToolBar->setContextMenuPolicy(Qt::CustomContextMenu);
-                        m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+                        m_pToolBar->setUseTextLabels(true);
 #ifdef VBOX_WS_MAC
                         m_pToolBar->emulateMacToolbar();
@@ -810 +808 @@
     /* Restore toolbar settings: */
     {
-        m_pToolBar->setToolButtonStyle(  gEDataManager->selectorWindowToolBarTextVisible()
-                                       ? Qt::ToolButtonTextUnderIcon
-                                       : Qt::ToolButtonIconOnly);
+        m_pToolBar->setUseTextLabels(gEDataManager->selectorWindowToolBarTextVisible());
     }