diff options
| author | Jens Bache-Wiig <jbache@trolltech.com> | 2009-11-18 15:08:37 (GMT) |
|---|---|---|
| committer | Jens Bache-Wiig <jbache@trolltech.com> | 2009-11-18 15:24:05 (GMT) |
| commit | 5d4f58843bb1c8590986aa710dbea30525578a5f (patch) | |
| tree | 6ac71cccfa21c961076dae6c2501631bce222a86 /src/gui/styles/qcleanlooksstyle.cpp | |
| parent | d173dabf3e441bf4a16237df1a90e256ae525596 (diff) | |
| download | Qt-5d4f58843bb1c8590986aa710dbea30525578a5f.zip Qt-5d4f58843bb1c8590986aa710dbea30525578a5f.tar.gz Qt-5d4f58843bb1c8590986aa710dbea30525578a5f.tar.bz2 | |
Fix multiple regressions in QGtkStyle caused by freetype fixes
Qt 4.6 reports smaller sizes for all fonts which means a lot of
the size adjustments QGtkStyle does were now off. I have adjusted
most of them including some fixes to menu items themselves.
Note that the changes were introduced with this change:
04d18b38c38c5ff623b30366ea08d56128b9b7d0
We now also adapt to GNOME 2.16 style submenu arrow sizes.
Combo boxes, line edits, spin boxes and push buttons should
finally have a uniform height.
Task-number: QTBUG-5753
Reviewed-by: thorbjorn
Diffstat (limited to 'src/gui/styles/qcleanlooksstyle.cpp')
| -rw-r--r-- | src/gui/styles/qcleanlooksstyle.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/styles/qcleanlooksstyle.cpp b/src/gui/styles/qcleanlooksstyle.cpp index 973e682..b08847d 100644 --- a/src/gui/styles/qcleanlooksstyle.cpp +++ b/src/gui/styles/qcleanlooksstyle.cpp @@ -3817,6 +3817,7 @@ QSize QCleanlooksStyle::sizeFromContents(ContentsType type, const QStyleOption * newSize.setWidth(80); if (!btn->icon.isNull() && btn->iconSize.height() > 16) newSize -= QSize(0, 2); + newSize += QSize(0, 1); } if (const QPushButton *button = qobject_cast<const QPushButton *>(widget)) { if (qobject_cast<const QDialogButtonBox *>(button->parentWidget())) { |