summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Bache-Wiig <jbache@trolltech.com>2009-09-22 11:08:50 (GMT)
committerJens Bache-Wiig <jbache@trolltech.com>2009-09-22 11:11:29 (GMT)
commit848b4e21f975a0b05639e8ee47fb3dcbb4dbf37d (patch)
treef4f8816c70f1685f4ea882c059f6c38ae279ddf9
parent5dda48852ae85929e9d0cf1432c0c3a51ae0ce81 (diff)
downloadQt-848b4e21f975a0b05639e8ee47fb3dcbb4dbf37d.zip
Qt-848b4e21f975a0b05639e8ee47fb3dcbb4dbf37d.tar.gz
Qt-848b4e21f975a0b05639e8ee47fb3dcbb4dbf37d.tar.bz2
Fix autotest failure on combo box with Gtk+
We were not respecting the rect offset on combo box arrows. This was preventing the autotest from happily completing with GTK+ style. Reviewed-by: joao
-rw-r--r--src/gui/styles/qgtkstyle.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp
index f3dc4ac..414580e 100644
--- a/src/gui/styles/qgtkstyle.cpp
+++ b/src/gui/styles/qgtkstyle.cpp
@@ -3063,14 +3063,14 @@ QRect QGtkStyle::subControlRect(ComplexControl control, const QStyleOptionComple
if (!arrowWidget)
return QCleanlooksStyle::subControlRect(control, option, subControl, widget);
- QRect buttonRect(arrowWidget->allocation.x, arrowWidget->allocation.y,
+ QRect buttonRect(option->rect.left() + arrowWidget->allocation.x,
+ option->rect.top() + arrowWidget->allocation.y,
arrowWidget->allocation.width, arrowWidget->allocation.height);
switch (subControl) {
case SC_ComboBoxArrow: // Note: this indicates the arrowbutton for editable combos
rect = buttonRect;
-
break;
case SC_ComboBoxEditField: {