summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Hautakangas <ext-jani.hautakangas@nokia.com>2010-01-11 15:52:31 (GMT)
committerJani Hautakangas <ext-jani.hautakangas@nokia.com>2010-01-11 15:52:31 (GMT)
commitf10a3a1008c2ccbfbdf7f3e0cfe6af34c8a7db9c (patch)
tree561ac85d434d91acdbe84a5d7c0fc56d6b2a01d4
parentd8ad9ac86dac9489b553e6416329308ae7d823d0 (diff)
downloadQt-f10a3a1008c2ccbfbdf7f3e0cfe6af34c8a7db9c.zip
Qt-f10a3a1008c2ccbfbdf7f3e0cfe6af34c8a7db9c.tar.gz
Qt-f10a3a1008c2ccbfbdf7f3e0cfe6af34c8a7db9c.tar.bz2
Fix for QTBUG-7267 Qs60Style::drawControl() does not align CE_ItemViewItem
control element correctly if given widget is null. Uses now alignment hint value given in style option. Task-number: QTBUG-7267 Reviewed-by: Janne Koskinen
-rw-r--r--src/gui/styles/qs60style.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index bcc993a..d78ea21 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -1363,7 +1363,7 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option,
}
}
- int rightValue = widget ? widget->contentsRect().right() : 0;
+ int rightValue = widget ? widget->contentsRect().right() : voptAdj.rect.right();
if (isScrollBarVisible)
rightValue -= scrollBarWidth;