diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-02-05 15:02:30 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-02-05 15:02:30 (GMT) |
| commit | 12f9af3d569210e928d1d5e3a174c53a97dd3372 (patch) | |
| tree | a2c4ab87deeb87cd5256a1df9e1b80df3be61094 /src/gui/styles/qs60style.cpp | |
| parent | ced7ed0bc745618e1b0618a17b112f983dd4a9c6 (diff) | |
| parent | 906f77bcfd4358f35155075b6d5fd8a383adadba (diff) | |
| download | Qt-12f9af3d569210e928d1d5e3a174c53a97dd3372.zip Qt-12f9af3d569210e928d1d5e3a174c53a97dd3372.tar.gz Qt-12f9af3d569210e928d1d5e3a174c53a97dd3372.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/styles/qs60style.cpp')
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index fc435e8..9025e5b 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2399,13 +2399,14 @@ QSize QS60Style::sizeFromContents(ContentsType ct, const QStyleOption *opt, sz.setHeight(sz.height() + 2 * pixelMetric(PM_FocusFrameVMargin)); break; #ifndef QT_NO_COMBOBOX - case CT_ComboBox: - // Fixing Ui design issues with too wide QComboBoxes and greedy SizeHints - // Make sure, that the combobox says within the screen. - const QSize desktopContentSize = QApplication::desktop()->availableGeometry().size() - -QSize(pixelMetric(PM_LayoutLeftMargin) + pixelMetric(PM_LayoutRightMargin), 0); - sz = QCommonStyle::sizeFromContents(ct, opt, csz, widget). - boundedTo(desktopContentSize); + case CT_ComboBox: { + // Fixing Ui design issues with too wide QComboBoxes and greedy SizeHints + // Make sure, that the combobox says within the screen. + const QSize desktopContentSize = QApplication::desktop()->availableGeometry().size() + -QSize(pixelMetric(PM_LayoutLeftMargin) + pixelMetric(PM_LayoutRightMargin), 0); + sz = QCommonStyle::sizeFromContents(ct, opt, csz, widget). + boundedTo(desktopContentSize); + } break; #endif default: |