Changeset 47042 in vbox for trunk/src/VBox

Timestamp:

Jul 8, 2013 2:28:27 PM (12 years ago)

Author:

vboxsync

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

87076

Message:

FE/Qt: Popup-center: Font-tuning for popup-pane's text-pane.

Location:

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

Files:

• UIPopupPaneTextPane.cpp (modified) (3 diffs)
• UIPopupPaneTextPane.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneTextPane.cpp

@@ -194 +194 @@
     {
         /* Prepare label: */
-        QFont currentFont = m_pLabel->font();
-#ifdef Q_WS_MAC
-        currentFont.setPointSize(currentFont.pointSize() - 2);
-#else /* Q_WS_MAC */
-        currentFont.setPointSize(currentFont.pointSize() - 1);
-#endif /* !Q_WS_MAC */
-        m_pLabel->setFont(currentFont);
+        m_pLabel->setFont(tuneFont(m_pLabel->font()));
         m_pLabel->setWordWrap(true);
         m_pLabel->setFocusPolicy(Qt::NoFocus);
@@ -210 +204 @@
     {
         /* Prepare check-box: */
-        QFont currentFont = m_pAutoConfirmCheckBox->font();
-#ifdef Q_WS_MAC
-        currentFont.setPointSize(currentFont.pointSize() - 2);
-#else /* Q_WS_MAC */
-        currentFont.setPointSize(currentFont.pointSize() - 1);
-#endif /* !Q_WS_MAC */
-        m_pAutoConfirmCheckBox->setFont(currentFont);
+        m_pAutoConfirmCheckBox->setFont(tuneFont(m_pAutoConfirmCheckBox->font()));
         m_pAutoConfirmCheckBox->setFocusPolicy(Qt::NoFocus);
     }
@@ -276 +264 @@
 }
 
+/* static */
+QFont UIPopupPaneTextPane::tuneFont(QFont font)
+{
+#if defined(Q_WS_MAC)
+    font.setPointSize(currentFont.pointSize() - 2);
+#elif defined(Q_WS_X11)
+    font.setPointSize(currentFont.pointSize() - 1);
+#endif
+    return font;
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneTextPane.h

@@ -92 +92 @@
     QSize expandedSizeHint() const { return m_expandedSizeHint; }
 
+    /* Static helper: Font stuff: */
+    static QFont tuneFont(QFont font);
+
     /* Variables: Layout stuff: */
     const int m_iLayoutMargin;