diff options
| author | Sami Merila <sami.merila@nokia.com> | 2010-05-04 07:26:05 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2010-05-04 07:26:05 (GMT) |
| commit | 81f9fec83bc425d190a3159f9a7ab2672e094cb2 (patch) | |
| tree | d16931363518899174fde43f4ebc220ff65ac92d /src/gui/styles/qs60style.cpp | |
| parent | f9ce9ae008d1e055d5cbbbef6dddd3dd8b226624 (diff) | |
| download | Qt-81f9fec83bc425d190a3159f9a7ab2672e094cb2.zip Qt-81f9fec83bc425d190a3159f9a7ab2672e094cb2.tar.gz Qt-81f9fec83bc425d190a3159f9a7ab2672e094cb2.tar.bz2 | |
QS60Style: QTabWidget icon size property doesn't work
QS60Style did check if the tab icon size was larger than pixel metric
for default tab icon size. If it was, then it reset the icon size to
match pixel metric. It was impossible to set large icon to tab widget.
As a fix, this check was removed from style.
Task-number: QTBUG-3102
Reviewed-by: Jason Barron
Diffstat (limited to 'src/gui/styles/qs60style.cpp')
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index c0c1cdd..20297ae 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -1667,9 +1667,10 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option, alignment |= Qt::TextHideMnemonic; if (!optionTab.icon.isNull()) { QSize iconSize = optionTab.iconSize; - int iconExtent = pixelMetric(PM_TabBarIconSize); - if (iconSize.height() > iconExtent || iconSize.width() > iconExtent) + if (!iconSize.isValid()) { + const int iconExtent = pixelMetric(PM_TabBarIconSize); iconSize = QSize(iconExtent, iconExtent); + } QPixmap tabIcon = optionTab.icon.pixmap(iconSize, (optionTab.state & State_Enabled) ? QIcon::Normal : QIcon::Disabled); if (tab->text.isEmpty()) |