summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSami Merila <sami.merila@nokia.com>2010-06-15 13:09:41 (GMT)
committerSami Merila <sami.merila@nokia.com>2010-06-15 13:09:41 (GMT)
commit28ce5c1f2c0dbbfe45b5c3744bf03a2548c12223 (patch)
treeec47d538bca653df6c4880a60870e0f51754cbfd /src
parent86b13101afe31934eddb0c904ac6d2815cd39e5e (diff)
downloadQt-28ce5c1f2c0dbbfe45b5c3744bf03a2548c12223.zip
Qt-28ce5c1f2c0dbbfe45b5c3744bf03a2548c12223.tar.gz
Qt-28ce5c1f2c0dbbfe45b5c3744bf03a2548c12223.tar.bz2
ComboBox popuplist is not correctly layouted in fullscreen mode
This is part two of the fix for issue QTBUG-9913. This corrects the left margin of the ComboBox menu to start from the left screen border (for LetToRight UI Layout), instead of having small margin. Task-number: QTBUG-9913 Reviewed-by: Alessandro Portale
Diffstat (limited to 'src')
-rw-r--r--src/gui/styles/qs60style.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 1a8dd78..45bcc00 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -2870,16 +2870,7 @@ QRect QS60Style::subControlRect(ComplexControl control, const QStyleOptionComple
}
break;
case SC_ComboBoxListBoxPopup: {
- const QRect desktopContent = QApplication::desktop()->availableGeometry();
-
- // take the size of this and position bottom above available area
- QRect popupRect;
- const int width = desktopContent.width() - pixelMetric(PM_LayoutRightMargin) - pixelMetric(PM_LayoutLeftMargin);
- popupRect.setWidth(width);
- popupRect.setHeight(desktopContent.height()); //combobox resets height anyway based on content
- popupRect.setBottom(desktopContent.bottom());
- popupRect.translate(pixelMetric(PM_LayoutLeftMargin), 0);
- ret = popupRect;
+ ret = QApplication::desktop()->availableGeometry();
}
break;
default: