b11ba445 | 2014-11-21 21:58:18 | Timothy Pearson |
Properly polish QPopupMenu widgets This relates to Bug 1489 |
||
M src/kernel/qstyle.cpp M src/widgets/qpopupmenu.cpp |
||
diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp index e0b39b6..9b8e7ff 100644 --- a/src/kernel/qstyle.cpp +++ b/src/kernel/qstyle.cpp @@ -783,7 +783,7 @@ */ void QStyle::polishPopupMenu( QPopupMenu *pm ) { const QStyleControlElementData &ceData = populateControlElementDataFromWidget(pm, QStyleOption()); - unPolish(ceData, getControlElementFlagsForObject(pm, QStyleOption()), pm); + polish(ceData, getControlElementFlagsForObject(pm, QStyleOption()), pm); } /*! diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp index 8821537..46e5220 100644 --- a/src/widgets/qpopupmenu.cpp +++ b/src/widgets/qpopupmenu.cpp @@ -1222,7 +1222,7 @@ continue; int itemh = itemHeight( mi ); - + sz = style().sizeFromContents(QStyle::CT_PopupMenuItem, this, QSize(0, itemh), QStyleOption(mi,maxPMWidth)); sz = sz.expandedTo(QSize(itemw, sz.height())); @@ -1233,7 +1233,7 @@ y = contentsRect().y(); x +=itemw; } - if ( mi->widget() ) + if ( mi->widget() ) mi->widget()->setGeometry( x, y, itemw, mi->widget()->height() ); y += itemh; } |