summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorSami Merila <sami.merila@nokia.com>2010-05-03 13:19:05 (GMT)
committerSami Merila <sami.merila@nokia.com>2010-05-03 13:19:05 (GMT)
commitf9ce9ae008d1e055d5cbbbef6dddd3dd8b226624 (patch)
tree04acf7a524d20e4337ea40ad80b1a2612dce24de /src/gui
parentfb2c7c62030f1e2bf314fc30b9786de611563116 (diff)
downloadQt-f9ce9ae008d1e055d5cbbbef6dddd3dd8b226624.zip
Qt-f9ce9ae008d1e055d5cbbbef6dddd3dd8b226624.tar.gz
Qt-f9ce9ae008d1e055d5cbbbef6dddd3dd8b226624.tar.bz2
QS60Style: QComboBoxPrivateScroller draws holes into menu canvas
QComboBoxPrivateScroller calls eraserects for menu scroller areas, expecting the style to fill the gaps. Unfortunately, the QS60Style does not draw menu scrollers at all (but they are functional when interacted with). Therefore, these areas are now drawn as holes. As a fix, the eraseRect call from provate class QComboBoxPrivateScroller is removed when "s60 flag" is defined. Task-number: QTBUG-10371 Reviewed-by: Janne Koskinen
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/qcombobox_p.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/widgets/qcombobox_p.h b/src/gui/widgets/qcombobox_p.h
index 92d85cc..29a628c 100644
--- a/src/gui/widgets/qcombobox_p.h
+++ b/src/gui/widgets/qcombobox_p.h
@@ -200,7 +200,9 @@ protected:
menuOpt.menuItemType = QStyleOptionMenuItem::Scroller;
if (sliderAction == QAbstractSlider::SliderSingleStepAdd)
menuOpt.state |= QStyle::State_DownArrow;
+#ifndef Q_WS_S60
p.eraseRect(rect());
+#endif
style()->drawControl(QStyle::CE_MenuScroller, &menuOpt, &p);
}