diff options
| author | axis <qt-info@nokia.com> | 2009-11-12 14:20:06 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-12 14:20:06 (GMT) |
| commit | e0cd364f5b43c7b18214a605c7a5e1bb99c128a1 (patch) | |
| tree | 698871276723227d8175d26e875d93a4cbd56eeb /src/gui/styles | |
| parent | 037c1c3b3e1abc07f0570336bd7958121f32848a (diff) | |
| parent | 771672fa1a94a9b2b19e378d1b362dcdae323887 (diff) | |
| download | Qt-e0cd364f5b43c7b18214a605c7a5e1bb99c128a1.zip Qt-e0cd364f5b43c7b18214a605c7a5e1bb99c128a1.tar.gz Qt-e0cd364f5b43c7b18214a605c7a5e1bb99c128a1.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-staging2
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 02ffb29..9179237 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -473,7 +473,7 @@ void QS60StylePrivate::setBackgroundTexture(QApplication *app) const Q_UNUSED(app) QPalette applicationPalette = QApplication::palette(); applicationPalette.setBrush(QPalette::Window, backgroundTexture()); - setThemePalette(app); + setThemePalette(&applicationPalette); } void QS60StylePrivate::deleteBackground() @@ -799,6 +799,9 @@ QSize QS60StylePrivate::partSize(QS60StyleEnums::SkinParts part, SkinElementFlag case QS60StyleEnums::SP_QgnGrafTabPassiveR: case QS60StyleEnums::SP_QgnGrafTabPassiveL: case QS60StyleEnums::SP_QgnGrafTabActiveL: + //Returned QSize for tabs must not be square, but narrow rectangle with width:height + //ratio of 1:2 for horizontal tab bars (and 2:1 for vertical ones). + result.setWidth(10); break; case QS60StyleEnums::SP_QgnIndiSliderEdit: result.scale(pixelMetric(QStyle::PM_SliderLength), @@ -809,7 +812,7 @@ QSize QS60StylePrivate::partSize(QS60StyleEnums::SkinParts part, SkinElementFlag case QS60StyleEnums::SP_QgnGrafBarFrameSideR: result.setWidth(pixelMetric(PM_Custom_FrameCornerWidth)); break; - + case QS60StyleEnums::SP_QsnCpScrollHandleBottomPressed: case QS60StyleEnums::SP_QsnCpScrollHandleTopPressed: case QS60StyleEnums::SP_QsnCpScrollHandleMiddlePressed: |