Fix font propagation issues with QComboBox and the popup menu.

This has always been a bit bumpy, the problem is that the popup normally
has its own styling from the desktop, plus it's its own top-level and
that is normally a boundary for propagation. Of course, people are
surprised by this (especially when it works for editable). So, we need
to be a bit better propagating the info. Also the QStyleOptionMenuItem
has the correct font, but if it's set on a window, by the time it
reaches the popup, its resolve mask is very weak, so it will fail to
resolve at all. Setting the point size allows the font to have a bit of
strength.

Task-number: 257486
Reviewed-by: Jens Bache-Wiig

2 files changed, 12 insertions, 2 deletions

diff --git a/src/gui/styles/qcleanlooksstyle.cpp b/src/gui/styles/qcleanlooksstyle.cpp
index 3855ba7..01f19c6 100644
--- a/src/gui/styles/qcleanlooksstyle.cpp
+++ b/src/gui/styles/qcleanlooksstyle.cpp
@@ -2042,6 +2042,12 @@ void QCleanlooksStyle::drawControl(ControlElement element, const QStyleOption *o
                     s = s.left(t);
                 }
                 QFont font = menuitem->font;
+                // font may not have any "hard" flags set. We override
+                // the point size so that when it is resolved against the device, this font will win.
+                // This is mainly to handle cases where someone sets the font on the window
+                // and then the combo inherits it and passes it onward. At that point the resolve mask
+                // is very, very weak. This makes it stonger.
+                font.setPointSizeF(menuItem->font.pointSizeF());
 
                 if (menuitem->menuItemType == QStyleOptionMenuItem::DefaultItem)
                     font.setBold(true);
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm
index b20db5b..c08009b 100644
--- a/src/gui/styles/qmacstyle_mac.mm
+++ b/src/gui/styles/qmacstyle_mac.mm
@@ -3991,8 +3991,12 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
 
                 const int xm = macItemFrame + maxpmw + macItemHMargin;
                 QFont myFont = mi->font;
-                if (mi->state & QStyle::State_Mini)
-                    myFont.setPointSize(mi->font.pointSize());
+                // myFont may not have any "hard" flags set. We override
+                // the point size so that when it is resolved against the device, this font will win.
+                // This is mainly to handle cases where someone sets the font on the window
+                // and then the combo inherits it and passes it onward. At that point the resolve mask
+                // is very, very weak. This makes it stonger.
+                myFont.setPointSizeF(mi->font.pointSizeF());
                 p->setFont(myFont);
                 p->drawText(xpos, yPos, contentRect.width() - xm - tabwidth + 1,
                             contentRect.height(), text_flags ^ Qt::AlignRight, s);