diff options
| author | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2009-04-08 13:29:06 (GMT) |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2009-04-08 13:29:06 (GMT) |
| commit | c4c7cd9740819e375ad6a859de406de0781f53f8 (patch) | |
| tree | 0277a46d7967a0f001d7764bf7f3c0276ac0522f /src/gui | |
| parent | f034683be4d84bacd874b24a846d1833f4d4f4df (diff) | |
| parent | f2edb497ac2c3ff6f8c004046e216b8bdf7c4347 (diff) | |
| download | Qt-c4c7cd9740819e375ad6a859de406de0781f53f8.zip Qt-c4c7cd9740819e375ad6a859de406de0781f53f8.tar.gz Qt-c4c7cd9740819e375ad6a859de406de0781f53f8.tar.bz2 | |
Merge branch '4.5' of http://git.scm.dev.nokia.troll.no/qt/qt into 4.5
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/styles/qgtkstyle.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp index b569b5c..519fed7 100644 --- a/src/gui/styles/qgtkstyle.cpp +++ b/src/gui/styles/qgtkstyle.cpp @@ -2507,6 +2507,10 @@ void QGtkStyle::drawControl(ControlElement element, if (selected) { QRect rect = option->rect.adjusted(0, 0, -1, -1); +#ifndef QT_NO_COMBOBOX + if (qobject_cast<const QComboBox*>(widget)) + rect = option->rect; +#endif gtkPainter.paintBox( gtkMenuItem, "menuitem", rect, GTK_STATE_PRELIGHT, GTK_SHADOW_OUT, style); } |