MCL/sf/mw/qt: comparison src/gui/styles/qs60style.cpp

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtGui of the Qt Toolkit.
+** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
 ** This file contains pre-release code and may not be distributed.
 ** You may use this file in accordance with the terms and conditions
 #include "qtablewidget.h"
 #include "qtableview.h"
 #include "qtextedit.h"
 #include "qtoolbar.h"
 #include "qtoolbutton.h"
-#include "qtreeview.h"
 #include "qfocusframe.h"
+#include "qformlayout.h"
 #include "private/qtoolbarextension_p.h"
 #include "private/qcombobox_p.h"
 #include "private/qwidget_p.h"
 #include "private/qapplication_p.h"
 extern Q_GUI_EXPORT int qt_defaultDpiY();
 const QS60StylePrivate::SkinElementFlags QS60StylePrivate::KDefaultSkinElementFlags =
 SkinElementFlags(SF_PointNorth | SF_StateEnabled);
-static const QByteArray propertyKeyLayouts = "layouts";
-static const QByteArray propertyKeyCurrentlayout = "currentlayout";
 static const qreal goldenRatio = 1.618;
 const layoutHeader QS60StylePrivate::m_layoutHeaders[] = {
 // *** generated layout data ***
-{240,320,1,14,true,"QVGA Landscape Mirrored"},
+{240,320,1,15,"QVGA Landscape"},
-{240,320,1,14,false,"QVGA Landscape"},
+{320,240,1,15,"QVGA Portrait"},
-{320,240,1,14,true,"QVGA Portrait Mirrored"},
+{360,640,1,15,"NHD Landscape"},
-{320,240,1,14,false,"QVGA Portrait"},
+{640,360,1,15,"NHD Portrait"},
-{360,640,1,14,true,"NHD Landscape Mirrored"},
+{352,800,1,12,"E90 Landscape"}
-{360,640,1,14,false,"NHD Landscape"},
-{640,360,1,14,true,"NHD Portrait Mirrored"},
-{640,360,1,14,false,"NHD Portrait"},
-{352,800,1,12,true,"E90 Landscape Mirrored"},
-{352,800,1,12,false,"E90 Landscape"}
 // *** End of generated data ***
 };
 const int QS60StylePrivate::m_numberOfLayouts =
 (int)sizeof(QS60StylePrivate::m_layoutHeaders)/sizeof(QS60StylePrivate::m_layoutHeaders[0]);
 const short QS60StylePrivate::data[][MAX_PIXELMETRICS] = {
 // *** generated pixel metrics ***
-{5,0,-909,0,0,1,0,0,-1,8,15,22,15,15,7,198,-909,-909,-909,19,15,2,0,0,21,-909,21,-909,4,4,1,-909,-909,0,2,0,0,13,23,17,17,21,21,2,115,21,0,-909,-909,-909,-909,0,0,15,1,-909,0,0,-909,15,-909,-909,-909,-909,32,21,51,27,51,4,4,5,10,15,-909,5,58,12,5,0,7,4,4,9,4,4,-909,1,-909,-909,-909,-909,4,4,3,1},
+{5,0,-909,0,0,2,0,0,-1,7,12,19,13,13,6,200,-909,-909,-909,20,13,2,0,0,21,7,18,-909,3,3,1,-909,-909,0,1,0,0,12,20,15,15,18,18,1,115,18,0,-909,-909,-909,-909,0,0,16,2,-909,0,0,-909,16,-909,-909,-909,-909,32,18,55,24,55,3,3,4,9,13,-909,5,51,11,5,0,3,3,6,8,3,3,-909,2,-909,-909,-909,-909,5,5,3,1},
-{5,0,-909,0,0,1,0,0,-1,8,15,22,15,15,7,198,-909,-909,-909,19,15,2,0,0,21,-909,21,-909,4,4,1,-909,-909,0,2,0,0,13,23,17,17,21,21,2,115,21,0,-909,-909,-909,-909,0,0,15,1,-909,0,0,-909,15,-909,-909,-909,-909,32,21,51,27,51,4,4,5,10,15,-909,5,58,12,5,0,4,4,7,9,4,4,-909,1,-909,-909,-909,-909,4,4,3,1},
+{5,0,-909,0,0,1,0,0,-1,8,14,22,15,15,7,164,-909,-909,-909,19,15,2,0,0,21,8,27,-909,4,4,1,-909,-909,0,7,6,0,13,23,17,17,21,21,7,115,21,0,-909,-909,-909,-909,0,0,15,1,-909,0,0,-909,15,-909,-909,-909,-909,32,21,65,27,65,4,4,5,10,15,-909,5,58,13,5,0,4,4,7,9,4,4,-909,2,-909,-909,-909,-909,6,6,3,1},
-{5,0,-909,0,0,1,0,0,-1,8,14,22,15,15,7,164,-909,-909,-909,19,15,2,0,0,21,-909,27,-909,4,4,1,-909,-909,0,7,6,0,13,23,17,17,21,21,7,115,21,0,-909,-909,-909,-909,0,0,15,1,-909,0,0,-909,15,-909,-909,-909,-909,32,21,65,27,65,4,4,5,10,15,-909,5,58,13,5,0,7,4,4,9,4,4,-909,1,-909,-909,-909,-909,4,4,3,1},
+{7,0,-909,0,0,2,0,0,-1,25,69,28,19,19,9,258,-909,-909,-909,23,19,26,0,0,32,25,72,-909,5,5,2,-909,-909,0,7,21,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,25,2,-909,0,0,-909,25,-909,-909,-909,-909,87,27,77,35,77,5,5,6,8,19,-909,7,74,19,7,0,5,5,8,12,5,5,-909,3,-909,-909,-909,-909,7,7,3,1},
-{5,0,-909,0,0,1,0,0,-1,8,14,22,15,15,7,164,-909,-909,-909,19,15,2,0,0,21,-909,27,-909,4,4,1,-909,-909,0,7,6,0,13,23,17,17,21,21,7,115,21,0,-909,-909,-909,-909,0,0,15,1,-909,0,0,-909,15,-909,-909,-909,-909,32,21,65,27,65,4,4,5,10,15,-909,5,58,13,5,0,4,4,7,9,4,4,-909,1,-909,-909,-909,-909,4,4,3,1},
+{7,0,-909,0,0,2,0,0,-1,25,68,28,19,19,9,258,-909,-909,-909,31,19,6,0,0,32,25,60,-909,5,5,2,-909,-909,0,7,32,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,26,2,-909,0,0,-909,26,-909,-909,-909,-909,87,27,96,35,96,5,5,6,8,19,-909,7,74,22,7,0,5,5,8,12,5,5,-909,3,-909,-909,-909,-909,7,7,3,1},
-{7,0,-909,0,0,2,0,0,-1,20,53,28,19,19,9,258,-909,-909,-909,29,19,26,0,0,32,-909,72,-909,5,5,2,-909,-909,0,7,21,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,25,2,-909,0,0,-909,25,-909,-909,-909,-909,87,27,77,35,77,5,5,6,8,19,-909,7,74,19,7,0,8,5,5,12,5,5,-909,2,-909,-909,-909,-909,7,7,3,1},
+{7,0,-909,0,0,2,0,0,-1,10,20,27,18,18,9,301,-909,-909,-909,29,18,5,0,0,35,7,32,-909,5,5,2,-909,-909,0,2,8,0,16,28,21,21,26,26,2,170,26,0,-909,-909,-909,-909,0,0,21,6,-909,0,0,-909,-909,-909,-909,-909,-909,54,26,265,34,265,5,5,6,3,18,-909,7,72,19,7,0,5,6,8,11,6,5,-909,2,-909,-909,-909,-909,5,5,3,1}
-{7,0,-909,0,0,2,0,0,-1,20,53,28,19,19,9,258,-909,-909,-909,29,19,26,0,0,32,-909,72,-909,5,5,2,-909,-909,0,7,21,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,25,2,-909,0,0,-909,25,-909,-909,-909,-909,87,27,77,35,77,5,5,6,8,19,-909,7,74,19,7,0,5,5,8,12,5,5,-909,2,-909,-909,-909,-909,7,7,3,1},
-{7,0,-909,0,0,2,0,0,-1,20,52,28,19,19,9,258,-909,-909,-909,29,19,6,0,0,32,-909,60,-909,5,5,2,-909,-909,0,7,32,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,26,2,-909,0,0,-909,26,-909,-909,-909,-909,87,27,98,35,98,5,5,6,8,19,-909,7,74,22,7,0,8,5,5,12,5,5,-909,2,-909,-909,-909,-909,7,7,3,1},
-{7,0,-909,0,0,2,0,0,-1,20,52,28,19,19,9,258,-909,-909,-909,29,19,6,0,0,32,-909,60,-909,5,5,2,-909,-909,0,7,32,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,26,2,-909,0,0,-909,26,-909,-909,-909,-909,87,27,98,35,98,5,5,6,8,19,-909,7,74,22,7,0,5,5,8,12,5,5,-909,2,-909,-909,-909,-909,7,7,3,1},
-{7,0,-909,0,0,2,0,0,-1,10,20,27,18,18,9,301,-909,-909,-909,29,18,5,0,0,35,-909,32,-909,5,5,2,-909,-909,0,2,8,0,16,28,21,21,26,26,2,170,26,0,-909,-909,-909,-909,0,0,21,5,-909,0,0,-909,-909,-909,-909,-909,-909,54,26,265,34,265,5,5,6,3,18,-909,7,72,19,7,0,8,6,5,11,6,5,-909,2,-909,-909,-909,-909,5,5,3,1},
-{7,0,-909,0,0,2,0,0,-1,10,20,27,18,18,9,301,-909,-909,-909,29,18,5,0,0,35,-909,32,-909,5,5,2,-909,-909,0,2,8,0,16,28,21,21,26,26,2,170,26,0,-909,-909,-909,-909,0,0,21,6,-909,0,0,-909,-909,-909,-909,-909,-909,54,26,265,34,265,5,5,6,3,18,-909,7,72,19,7,0,5,6,8,11,6,5,-909,2,-909,-909,-909,-909,5,5,3,1}
 // *** End of generated data ***
 };
 const short *QS60StylePrivate::m_pmPointer = QS60StylePrivate::data[0];
 {SE_ToolBar,                QS60StyleEnums::SP_QsnFrPopupSubCenter},
 {SE_ToolBarButton,          QS60StyleEnums::SP_QsnFrSctrlButtonCenter},
 {SE_ToolBarButtonPressed,   QS60StyleEnums::SP_QsnFrSctrlButtonCenterPressed},
 {SE_PanelBackground,        QS60StyleEnums::SP_QsnFrSetOptCenter},
 {SE_ButtonInactive,         QS60StyleEnums::SP_QsnFrButtonCenterInactive},
-{SE_Editor,                 QS60StyleEnums::SP_QsnFrNotepadCenter},
+{SE_Editor,                 QS60StyleEnums::SP_QsnFrInputCenter},
 };
 static const int frameElementsCount =
 int(sizeof(QS60StylePrivate::m_frameElementsData)/sizeof(QS60StylePrivate::m_frameElementsData[0]));
 case SE_ScrollBarHandleVertical:
 drawRow(QS60StyleEnums::SP_QsnCpScrollHandleTop, QS60StyleEnums::SP_QsnCpScrollHandleMiddle,
 QS60StyleEnums::SP_QsnCpScrollHandleBottom, Qt::Vertical, painter, rect, flags | SF_PointNorth);
 break;
 case SE_SliderHandleHorizontal:
-drawPart(QS60StyleEnums::SP_QgnIndiSliderEdit, painter, rect, flags | SF_PointNorth);
+drawPart(QS60StyleEnums::SP_QgnGrafNsliderMarker, painter, rect, flags | SF_PointNorth);
 break;
 case SE_SliderHandleVertical:
-drawPart(QS60StyleEnums::SP_QgnIndiSliderEdit, painter, rect, flags | SF_PointEast);
+drawPart(QS60StyleEnums::SP_QgnGrafNsliderMarker, painter, rect, flags | SF_PointEast);
+break;
+case SE_SliderHandleSelectedHorizontal:
+drawPart(QS60StyleEnums::SP_QgnGrafNsliderMarkerSelected, painter, rect, flags | SF_PointNorth);
+break;
+case SE_SliderHandleSelectedVertical:
+drawPart(QS60StyleEnums::SP_QgnGrafNsliderMarkerSelected, painter, rect, flags | SF_PointEast);
+break;
+case SE_SliderGrooveVertical:
+drawRow(QS60StyleEnums::SP_QgnGrafNsliderEndLeft, QS60StyleEnums::SP_QgnGrafNsliderMiddle,
+QS60StyleEnums::SP_QgnGrafNsliderEndRight, Qt::Vertical, painter, rect, flags | SF_PointEast);
+break;
+case SE_SliderGrooveHorizontal:
+drawRow(QS60StyleEnums::SP_QgnGrafNsliderEndLeft, QS60StyleEnums::SP_QgnGrafNsliderMiddle,
+QS60StyleEnums::SP_QgnGrafNsliderEndRight, Qt::Horizontal, painter, rect, flags | SF_PointNorth);
 break;
 case SE_TabBarTabEastActive:
 drawRow(QS60StyleEnums::SP_QgnGrafTabActiveL, QS60StyleEnums::SP_QgnGrafTabActiveM,
 QS60StyleEnums::SP_QgnGrafTabActiveR, Qt::Vertical, painter, rect, flags | SF_PointEast);
 break;
 break;
 case SE_ButtonInactive:
 drawFrame(SF_ButtonInactive, painter, rect, flags | SF_PointNorth);
 break;
 case SE_Editor:
-drawFrame(SF_Editor, painter, rect, flags | SF_PointNorth);
+drawFrame(SF_FrameLineEdit, painter, rect, flags | SF_PointNorth);
 break;
 default:
 break;
 }
 }
 short QS60StylePrivate::pixelMetric(int metric)
 {
 Q_ASSERT(metric < MAX_PIXELMETRICS);
 const short returnValue = m_pmPointer[metric];
 return returnValue;
-}
-void QS60StylePrivate::setStyleProperty(const char *name, const QVariant &value)
-{
-if (name == propertyKeyCurrentlayout) {
-static const QStringList layouts = styleProperty(propertyKeyLayouts).toStringList();
-const QString layout = value.toString();
-Q_ASSERT(layouts.contains(layout));
-const int layoutIndex = layouts.indexOf(layout);
-setCurrentLayout(layoutIndex);
-QApplication::setLayoutDirection(m_layoutHeaders[layoutIndex].mirroring ? Qt::RightToLeft : Qt::LeftToRight);
-clearCaches();
-refreshUI();
-}
-}
-QVariant QS60StylePrivate::styleProperty(const char *name) const
-{
-if (name == propertyKeyLayouts) {
-static QStringList layouts;
-if (layouts.isEmpty())
-for (int i = 0; i < m_numberOfLayouts; i++)
-layouts.append(QLatin1String(m_layoutHeaders[i].layoutName));
-return layouts;
-}
-return QVariant();
 }
 QColor QS60StylePrivate::stateColor(const QColor &color, const QStyleOption *option)
 {
 QColor retColor (color);
 Q_ASSERT(frameImage.bytesPerLine() > 0);
 if (frameImage.isNull())
 return Qt::black;
 const QRgb *pixelRgb = (const QRgb*)frameImage.bits();
-const int pixels = frameImage.numBytes()/sizeof(QRgb);
+const int pixels = frameImage.byteCount()/sizeof(QRgb);
 int estimatedRed = 0;
 int estimatedGreen = 0;
 int estimatedBlue = 0;
 void QS60StylePrivate::setThemePalette(QApplication *app) const
 {
 Q_UNUSED(app)
 QPalette widgetPalette = QPalette(Qt::white);
 setThemePalette(&widgetPalette);
-QApplication::setPalette(widgetPalette); //calling QApplication::setPalette clears palette hash
-setThemePaletteHash(&widgetPalette);
-storeThemePalette(&widgetPalette);
-}
-void QS60StylePrivate::setThemePalette(QStyleOption *option) const
-{
-setThemePalette(&option->palette);
 }
 QPalette* QS60StylePrivate::themePalette()
 {
 return m_themePalette;
 void QS60StylePrivate::setBackgroundTexture(QApplication *app) const
 {
 Q_UNUSED(app)
 QPalette applicationPalette = QApplication::palette();
 applicationPalette.setBrush(QPalette::Window, backgroundTexture());
-QApplication::setPalette(applicationPalette);
+setThemePalette(&applicationPalette);
 }
 void QS60StylePrivate::deleteBackground()
 {
 if (m_background) {
 // Freezes on 3.1. Anyways, caching is only really needed on touch UI
 !(QSysInfo::s60Version() == QSysInfo::SV_S60_3_1 || QSysInfo::s60Version() == QSysInfo::SV_S60_3_2);
 #else
 true;
 #endif
-const QPixmap skinPartPixMap((doCache ? cachedPart : part)(skinPart, rect.size(), flags));
+const QPixmap skinPartPixMap((doCache ? cachedPart : part)(skinPart, rect.size(), painter, flags));
 if (!skinPartPixMap.isNull())
 painter->drawPixmap(rect.topLeft(), skinPartPixMap);
 }
 void QS60StylePrivate::drawFrame(SkinFrameElements frameElement, QPainter *painter, const QRect &rect, SkinElementFlags flags)
 drawPart(end, painter, endRect, flags);
 #endif
 }
 QPixmap QS60StylePrivate::cachedPart(QS60StyleEnums::SkinParts part,
-const QSize &size, SkinElementFlags flags)
+const QSize &size, QPainter *painter, SkinElementFlags flags)
 {
 QPixmap result;
 const QString cacheKey =
 QString::fromLatin1("S60Style: SkinParts=%1 QSize=%2|%3 SkinPartFlags=%4")
 .arg((int)part).arg(size.width()).arg(size.height()).arg((int)flags);
 if (!QPixmapCache::find(cacheKey, result)) {
-result = QS60StylePrivate::part(part, size, flags);
+result = QS60StylePrivate::part(part, size, painter, flags);
 QPixmapCache::insert(cacheKey, result);
 }
 return result;
 }
 void QS60StylePrivate::setThemePalette(QWidget *widget) const
 {
 if(!widget)
 return;
-QPalette widgetPalette = QApplication::palette(widget);
 //header view and its viewport need to be set 100% transparent button color, since drawing code will
 //draw transparent theme graphics to table column and row headers.
 if (qobject_cast<QHeaderView *>(widget)){
+QPalette widgetPalette = QApplication::palette(widget);
 widgetPalette.setColor(QPalette::Active, QPalette::ButtonText,
 s60Color(QS60StyleEnums::CL_QsnTextColors, 23, 0));
 QHeaderView* header = qobject_cast<QHeaderView *>(widget);
 widgetPalette.setColor(QPalette::Button, Qt::transparent );
-if ( header->viewport() )
+if (header->viewport())
 header->viewport()->setPalette(widgetPalette);
 QApplication::setPalette(widgetPalette, "QHeaderView");
 }
 }
 // basic colors
 palette->setColor(QPalette::WindowText,
 s60Color(QS60StyleEnums::CL_QsnTextColors, 6, 0));
 palette->setColor(QPalette::ButtonText,
-s60Color(QS60StyleEnums::CL_QsnTextColors, 6, 0));
+s60Color(QS60StyleEnums::CL_QsnTextColors, 20, 0));
 palette->setColor(QPalette::Text,
 s60Color(QS60StyleEnums::CL_QsnTextColors, 6, 0));
 palette->setColor(QPalette::ToolTipText,
 s60Color(QS60StyleEnums::CL_QsnTextColors, 55, 0));
 palette->setColor(QPalette::BrightText, palette->color(QPalette::WindowText).lighter());
 palette->setColor(QPalette::HighlightedText,
-s60Color(QS60StyleEnums::CL_QsnTextColors, 10, 0));
+s60Color(QS60StyleEnums::CL_QsnTextColors, 24, 0));
 palette->setColor(QPalette::Link,
 s60Color(QS60StyleEnums::CL_QsnHighlightColors, 3, 0));
 palette->setColor(QPalette::LinkVisited, palette->color(QPalette::Link).darker());
 palette->setColor(QPalette::Highlight,
 s60Color(QS60StyleEnums::CL_QsnHighlightColors, 2, 0));
 palette->setColor(QPalette::Light, palette->color(QPalette::Button).lighter());
 palette->setColor(QPalette::Dark, palette->color(QPalette::Button).darker());
 palette->setColor(QPalette::Midlight, palette->color(QPalette::Button).lighter(125));
 palette->setColor(QPalette::Mid, palette->color(QPalette::Button).darker(150));
 palette->setColor(QPalette::Shadow, Qt::black);
+QApplication::setPalette(*palette); //calling QApplication::setPalette clears palette hash
+setThemePaletteHash(palette);
+storeThemePalette(palette);
 }
 void QS60StylePrivate::deleteThemePalette()
 {
 if (m_themePalette) {
 //store the original palette
 QPalette widgetPalette = *palette;
 const QColor mainAreaTextColor =
 s60Color(QS60StyleEnums::CL_QsnTextColors, 6, 0);
-widgetPalette.setColor(QPalette::All, QPalette::WindowText,
+widgetPalette.setColor(QPalette::WindowText,
 s60Color(QS60StyleEnums::CL_QsnLineColors, 8, 0));
 QApplication::setPalette(widgetPalette, "QSlider");
 // return to original palette after each widget
 widgetPalette = *palette;
 widgetPalette.setColor(QPalette::Active, QPalette::ButtonText,
 s60Color(QS60StyleEnums::CL_QsnTextColors, 23, 0));
 QApplication::setPalette(widgetPalette, "QHeaderView");
 widgetPalette = *palette;
-widgetPalette.setColor(QPalette::All, QPalette::ButtonText,
+widgetPalette.setColor(QPalette::ButtonText,
 s60Color(QS60StyleEnums::CL_QsnTextColors, 8, 0));
 QApplication::setPalette(widgetPalette, "QMenuBar");
 widgetPalette = *palette;
-widgetPalette.setColor(QPalette::Active, QPalette::WindowText,
+widgetPalette.setColor(QPalette::WindowText,
 s60Color(QS60StyleEnums::CL_QsnTextColors, 4, 0));
 QApplication::setPalette(widgetPalette, "QTabBar");
 widgetPalette = *palette;
-widgetPalette.setColor(QPalette::All, QPalette::Text,
+widgetPalette.setColor(QPalette::Text,
 s60Color(QS60StyleEnums::CL_QsnTextColors, 22, 0));
 QApplication::setPalette(widgetPalette, "QTableView");
 widgetPalette = *palette;
-widgetPalette.setColor(QPalette::All, QPalette::HighlightedText,
+widgetPalette.setColor(QPalette::Text,
+s60Color(QS60StyleEnums::CL_QsnTextColors, 27, 0));
+widgetPalette.setColor(QPalette::HighlightedText,
 s60Color(QS60StyleEnums::CL_QsnTextColors, 24, 0));
 QApplication::setPalette(widgetPalette, "QLineEdit");
 widgetPalette = *palette;
-widgetPalette.setColor(QPalette::All, QPalette::Text,
+widgetPalette.setColor(QPalette::Text,
-s60Color(QS60StyleEnums::CL_QsnTextColors, 34, 0));
+s60Color(QS60StyleEnums::CL_QsnTextColors, 27, 0));
-widgetPalette.setColor(QPalette::All, QPalette::HighlightedText,
+widgetPalette.setColor(QPalette::HighlightedText,
 s60Color(QS60StyleEnums::CL_QsnTextColors, 24, 0));
 QApplication::setPalette(widgetPalette, "QTextEdit");
 widgetPalette = *palette;
-widgetPalette.setColor(QPalette::All, QPalette::HighlightedText,
+widgetPalette.setColor(QPalette::HighlightedText,
 s60Color(QS60StyleEnums::CL_QsnTextColors, 24, 0));
 QApplication::setPalette(widgetPalette, "QComboBox");
 widgetPalette = *palette;
 widgetPalette.setColor(QPalette::WindowText, mainAreaTextColor);
 widgetPalette = *palette;
 widgetPalette.setBrush(QPalette::Window, QBrush());
 QApplication::setPalette(widgetPalette, "QScrollArea");
 widgetPalette = *palette;
+//Webpages should not use S60 theme colors as they are designed to work
+//with themeBackground and do not generally mesh well with web page backgrounds.
+QPalette webPalette = *palette;
+webPalette.setColor(QPalette::WindowText, Qt::black);
+webPalette.setColor(QPalette::Text, Qt::black);
+QApplication::setPalette(webPalette, "QWebView");
+QApplication::setPalette(webPalette, "QGraphicsWebView");
 }
 QSize QS60StylePrivate::partSize(QS60StyleEnums::SkinParts part, SkinElementFlags flags)
 {
 QSize result(20, 20);
 case QS60StyleEnums::SP_QgnGrafTabPassiveM:
 case QS60StyleEnums::SP_QgnGrafTabActiveR:
 case QS60StyleEnums::SP_QgnGrafTabPassiveR:
 case QS60StyleEnums::SP_QgnGrafTabPassiveL:
 case QS60StyleEnums::SP_QgnGrafTabActiveL:
-break;
+//Returned QSize for tabs must not be square, but narrow rectangle with width:height
-case QS60StyleEnums::SP_QgnIndiSliderEdit:
+//ratio of 1:2 for horizontal tab bars (and 2:1 for vertical ones).
+result.setWidth(result.height()>>1);
+break;
+case QS60StyleEnums::SP_QgnGrafNsliderEndLeft:
+case QS60StyleEnums::SP_QgnGrafNsliderEndRight:
+case QS60StyleEnums::SP_QgnGrafNsliderMiddle:
+result.setWidth(result.height()>>1);
+break;
+case QS60StyleEnums::SP_QgnGrafNsliderMarker:
+case QS60StyleEnums::SP_QgnGrafNsliderMarkerSelected:
 result.scale(pixelMetric(QStyle::PM_SliderLength),
 pixelMetric(QStyle::PM_SliderControlThickness), Qt::IgnoreAspectRatio);
+break;
+case QS60StyleEnums::SP_QgnGrafBarFrameSideL:
+case QS60StyleEnums::SP_QgnGrafBarFrameSideR:
+result.setWidth(pixelMetric(PM_Custom_FrameCornerWidth));
 break;
 case QS60StyleEnums::SP_QsnCpScrollHandleBottomPressed:
 case QS60StyleEnums::SP_QsnCpScrollHandleTopPressed:
 case QS60StyleEnums::SP_QsnCpScrollHandleMiddlePressed:
 result.setHeight(temp);
 }
 return result;
 }
+bool QS60StylePrivate::canDrawThemeBackground(const QBrush &backgroundBrush)
+{
+//If brush is not changed from style's default values, draw theme graphics.
+return (backgroundBrush.color() == Qt::transparent ||
+backgroundBrush.style() == Qt::NoBrush) ? true : false;
+}
 /*!
 \class QS60Style
 \brief The QS60Style class provides a look and feel suitable for applications on S60.
 \since 4.6
 \ingroup appearance
 #endif // QT_NO_SCROLLBAR
 #ifndef QT_NO_SLIDER
 case CC_Slider:
 if (const QStyleOptionSlider *optionSlider = qstyleoption_cast<const QStyleOptionSlider *>(option)) {
-// The groove is just a centered line. Maybe a qgn_graf_line_* at some point
 const QRect sliderGroove = subControlRect(control, optionSlider, SC_SliderGroove, widget);
-const QPoint sliderGrooveCenter = sliderGroove.center();
 const bool horizontal = optionSlider->orientation == Qt::Horizontal;
-painter->save();
-if (widget)
+//Highlight
-painter->setPen(widget->palette().windowText().color());
+/*            if (optionSlider->state & QStyle::State_HasFocus)
-if (horizontal)
+drawPrimitive(PE_FrameFocusRect, optionSlider, painter, widget);*/
-painter->drawLine(0, sliderGrooveCenter.y(), sliderGroove.right(), sliderGrooveCenter.y());
-else
+//Groove graphics
-painter->drawLine(sliderGrooveCenter.x(), 0, sliderGrooveCenter.x(), sliderGroove.bottom());
+if (QS60StylePrivate::hasSliderGrooveGraphic()) {
-painter->restore();
+const QS60StylePrivate::SkinElements grooveElement = horizontal ?
+QS60StylePrivate::SE_SliderGrooveHorizontal :
+QS60StylePrivate::SE_SliderGrooveVertical;
+QS60StylePrivate::drawSkinElement(grooveElement, painter, sliderGroove, flags);
+} else {
+const QRect sliderGroove = subControlRect(control, optionSlider, SC_SliderGroove, widget);
+const QPoint sliderGrooveCenter = sliderGroove.center();
+const bool horizontal = optionSlider->orientation == Qt::Horizontal;
+painter->save();
+if (widget)
+painter->setPen(widget->palette().windowText().color());
+if (horizontal)
+painter->drawLine(0, sliderGrooveCenter.y(), sliderGroove.right(), sliderGrooveCenter.y());
+else
+painter->drawLine(sliderGrooveCenter.x(), 0, sliderGrooveCenter.x(), sliderGroove.bottom());
+painter->restore();
+}
+//Handle graphics
 const QRect sliderHandle = subControlRect(control, optionSlider, SC_SliderHandle, widget);
-const QS60StylePrivate::SkinElements handleElement =
+QS60StylePrivate::SkinElements handleElement;
-horizontal ? QS60StylePrivate::SE_SliderHandleHorizontal : QS60StylePrivate::SE_SliderHandleVertical;
+if (optionSlider->state & QStyle::State_Sunken)
+handleElement =
+horizontal ? QS60StylePrivate::SE_SliderHandleSelectedHorizontal : QS60StylePrivate::SE_SliderHandleSelectedVertical;
+else
+handleElement =
+horizontal ? QS60StylePrivate::SE_SliderHandleHorizontal : QS60StylePrivate::SE_SliderHandleVertical;
 QS60StylePrivate::drawSkinElement(handleElement, painter, sliderHandle, flags);
 }
 break;
 #endif // QT_NO_SLIDER
 #ifndef QT_NO_COMBOBOX
 #ifndef QT_NO_TOOLBUTTON
 case CC_ToolButton:
 if (const QStyleOptionToolButton *toolBtn = qstyleoption_cast<const QStyleOptionToolButton *>(option)) {
 const State bflags = toolBtn->state;
 const QRect button(subControlRect(control, toolBtn, SC_ToolButton, widget));
+QRect menuRect = QRect();
+if (toolBtn->subControls & SC_ToolButtonMenu)
+menuRect = subControlRect(control, toolBtn, SC_ToolButtonMenu, widget);
 QStyleOptionToolButton toolButton = *toolBtn;
 if (sub&SC_ToolButton) {
 QStyleOption tool(0);
 tool.palette = toolBtn->palette;
 QToolBar *toolBar = 0;
 if (widget)
 toolBar = qobject_cast<QToolBar *>(widget->parentWidget());
 if (bflags & (State_Sunken | State_On | State_Raised)) {
-tool.rect = button;
+tool.rect = button.unite(menuRect);
 tool.state = bflags;
 // todo: I'd like to move extension button next to where last button is
 // however, the painter seems to want to clip the button rect even if I turn of the clipping.
 if (toolBar && (qobject_cast<const QToolBarExtension *>(widget))){
 painter->restore();
 */
 } else {
 drawPrimitive(PE_PanelButtonTool, &tool, painter, widget);
 }
+if (toolButton.subControls & SC_ToolButtonMenu) {
+tool.rect = menuRect;
+tool.state = bflags;
+drawPrimitive(PE_IndicatorArrowDown, &tool, painter, widget);
+}
 }
 }
 if (toolBtn->features & QStyleOptionToolButton::Arrow) {
 QStyle::PrimitiveElement pe;
 QStyleOptionViewItemV4 voptAdj = *vopt;
 painter->save();
 painter->setClipRect(voptAdj.rect);
 const bool isSelected = (vopt->state & QStyle::State_Selected);
+const bool hasFocus = (vopt->state & QStyle::State_HasFocus);
-bool isVisible = false;
+bool isScrollBarVisible = false;
 int scrollBarWidth = 0;
 QList<QScrollBar *> scrollBars = qFindChildren<QScrollBar *>(widget);
 for (int i = 0; i < scrollBars.size(); ++i) {
 QScrollBar *scrollBar = scrollBars.at(i);
 if (scrollBar && scrollBar->orientation() == Qt::Vertical) {
-isVisible = scrollBar->isVisible();
+isScrollBarVisible = scrollBar->isVisible();
 scrollBarWidth = scrollBar->size().width();
 break;
 }
 }
 int rightValue = widget ? widget->contentsRect().right() : 0;
-if (isVisible)
+if (isScrollBarVisible)
 rightValue -= scrollBarWidth;
 if (voptAdj.rect.right() > rightValue)
 voptAdj.rect.setRight(rightValue);
 const QRect iconRect = subElementRect(SE_ItemViewItemDecoration, &voptAdj, widget);
 QRect textRect = subElementRect(SE_ItemViewItemText, &voptAdj, widget);
+const QAbstractItemView *itemView = qobject_cast<const QAbstractItemView *>(widget);
 // draw themed background for table unless background brush has been defined.
 if (vopt->backgroundBrush == Qt::NoBrush) {
-const QStyleOptionViewItemV4 *tableOption = qstyleoption_cast<const QStyleOptionViewItemV4 *>(option);
+if (itemView) {
-const QTableView *table = qobject_cast<const QTableView *>(widget);
+const QModelIndex index = vopt->index;
-if (table && tableOption) {
-const QModelIndex index = tableOption->index;
 //todo: Draw cell background only once - for the first cell.
 QStyleOptionViewItemV4 voptAdj2 = voptAdj;
-const QModelIndex indexFirst = table->model()->index(0,0);
+const QModelIndex indexFirst = itemView->model()->index(0,0);
-const QModelIndex indexLast = table->model()->index(
+const QModelIndex indexLast = itemView->model()->index(
-table->model()->rowCount()-1,table->model()->columnCount()-1);
+itemView->model()->rowCount()-1,itemView->model()->columnCount()-1);
-if (table->viewport())
+if (itemView->viewport())
-voptAdj2.rect = QRect( table->visualRect(indexFirst).topLeft(),
+voptAdj2.rect = QRect( itemView->visualRect(indexFirst).topLeft(),
-table->visualRect(indexLast).bottomRight()).intersect(table->viewport()->rect());
+itemView->visualRect(indexLast).bottomRight()).intersect(itemView->viewport()->rect());
-drawPrimitive(PE_PanelItemViewItem, &voptAdj2, painter, widget);
+drawPrimitive(PE_PanelItemViewItem, &voptAdj, painter, widget);
 }
-} else { QCommonStyle::drawPrimitive(PE_PanelItemViewItem, option, painter, widget);}
+} else { QCommonStyle::drawPrimitive(PE_PanelItemViewItem, &voptAdj, painter, widget);}
 // draw the focus rect
-if (isSelected) {
+if (isSelected | hasFocus) {
 QRect highlightRect = option->rect.adjusted(1,1,-1,-1);
-const QAbstractItemView *view = qobject_cast<const QAbstractItemView *>(widget);
+QAbstractItemView::SelectionBehavior selectionBehavior =
-if (view && view->selectionBehavior() != QAbstractItemView::SelectItems) {
+itemView ? itemView->selectionBehavior() : QAbstractItemView::SelectItems;
+if (selectionBehavior != QAbstractItemView::SelectItems) {
 // set highlight rect so that it is continuous from cell to cell, yet sligthly
 // smaller than cell rect
 int xBeginning = 0, yBeginning = 0, xEnd = 0, yEnd = 0;
-if (view->selectionBehavior() == QAbstractItemView::SelectRows) {
+if (selectionBehavior == QAbstractItemView::SelectRows) {
 yBeginning = 1; yEnd = -1;
 if (vopt->viewItemPosition == QStyleOptionViewItemV4::Beginning)
 xBeginning = 1;
 else if (vopt->viewItemPosition == QStyleOptionViewItemV4::End)
 xEnd = -1;
-} else if (view->selectionBehavior() == QAbstractItemView::SelectColumns) {
+} else if (selectionBehavior == QAbstractItemView::SelectColumns) {
 xBeginning = 1; xEnd = -1;
 if (vopt->viewItemPosition == QStyleOptionViewItemV4::Beginning)
 yBeginning = 1;
 else if (vopt->viewItemPosition == QStyleOptionViewItemV4::End)
 yEnd = -1;
 }
-highlightRect = option->rect.adjusted(xBeginning, yBeginning, xEnd, xBeginning);
+highlightRect = option->rect.adjusted(xBeginning, yBeginning, xEnd, yEnd);
 }
-QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_ListHighlight, painter, highlightRect, flags);
+if (vopt->showDecorationSelected &&
+(vopt->palette.highlight().color() == QS60StylePrivate::themePalette()->highlight().color()))
+QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_ListHighlight, painter, highlightRect, flags);
+else
+painter->fillRect(highlightRect, vopt->palette.highlight());
 }
 // draw the icon
 const QIcon::Mode mode = (voptAdj.state & QStyle::State_Enabled) ? QIcon::Normal : QIcon::Disabled;
 const QIcon::State state = voptAdj.state & QStyle::State_Open ? QIcon::On : QIcon::Off;
 voptAdj.icon.paint(painter, iconRect, voptAdj.decorationAlignment, mode, state);
 // Draw selection check mark. Show check mark only in multi selection modes.
-if (const QListView *listView = (qobject_cast<const QListView *>(widget))) {
+if (itemView) {
 const bool singleSelection =
-listView &&
+(itemView->selectionMode() == QAbstractItemView::SingleSelection ||
-(listView->selectionMode() == QAbstractItemView::SingleSelection ||
+itemView->selectionMode() == QAbstractItemView::NoSelection);
-listView->selectionMode() == QAbstractItemView::NoSelection);
 const QRect selectionRect = subElementRect(SE_ItemViewItemCheckIndicator, &voptAdj, widget);
+QStyleOptionViewItemV4 checkMarkOption(voptAdj);
+// Draw selection mark.
 if (voptAdj.state & QStyle::State_Selected && !singleSelection) {
-QStyleOptionViewItemV4 option(voptAdj);
+checkMarkOption.rect = selectionRect;
-option.rect = selectionRect;
+drawPrimitive(QStyle::PE_IndicatorViewItemCheck, &checkMarkOption, painter, widget);
-// Draw selection mark.
-drawPrimitive(QStyle::PE_IndicatorViewItemCheck, &option, painter, widget);
 if ( textRect.right() > selectionRect.left() )
 textRect.setRight(selectionRect.left());
 } else if (singleSelection &&
-voptAdj.features & QStyleOptionViewItemV2::HasCheckIndicator) {
+voptAdj.features & QStyleOptionViewItemV2::HasCheckIndicator &&
-// draw the check mark
+selectionRect.isValid()) {
-if (selectionRect.isValid()) {
+checkMarkOption.rect = selectionRect;
-QStyleOptionViewItemV4 option(*vopt);
+checkMarkOption.state = checkMarkOption.state & ~QStyle::State_HasFocus;
-option.rect = selectionRect;
-option.state = option.state & ~QStyle::State_HasFocus;
+switch (vopt->checkState) {
+case Qt::Unchecked:
-switch (vopt->checkState) {
+checkMarkOption.state |= QStyle::State_Off;
-case Qt::Unchecked:
+break;
-option.state |= QStyle::State_Off;
+case Qt::PartiallyChecked:
-break;
+checkMarkOption.state |= QStyle::State_NoChange;
-case Qt::PartiallyChecked:
+break;
-option.state |= QStyle::State_NoChange;
+case Qt::Checked:
-break;
+checkMarkOption.state |= QStyle::State_On;
-case Qt::Checked:
+break;
-option.state |= QStyle::State_On;
-break;
-}
-drawPrimitive(QStyle::PE_IndicatorViewItemCheck, &option, painter, widget);
 }
+drawPrimitive(QStyle::PE_IndicatorViewItemCheck, &checkMarkOption, painter, widget);
 }
 }
 // draw the text
 if (!voptAdj.text.isEmpty()) {
-const QStyleOptionViewItemV4 *tableOption = qstyleoption_cast<const QStyleOptionViewItemV4 *>(option);
 if (isSelected) {
-if (qobject_cast<const QTableView *>(widget) && tableOption)
+if (qobject_cast<const QTableView *>(widget))
 voptAdj.palette.setColor(
 QPalette::Text, QS60StylePrivate::s60Color(QS60StyleEnums::CL_QsnTextColors, 11, 0));
 else
 voptAdj.palette.setColor(
 QPalette::Text, QS60StylePrivate::s60Color(QS60StyleEnums::CL_QsnTextColors, 10, 0));
 uint text_flags = Qt::AlignLeading | Qt::TextShowMnemonic | Qt::TextDontClip
 | Qt::TextSingleLine | Qt::AlignVCenter;
 if (!styleHint(SH_UnderlineShortcut, menuItem, widget))
 text_flags |= Qt::TextHideMnemonic;
-QRect iconRect =
-subElementRect(SE_ItemViewItemDecoration, &optionMenuItem, widget);
-QRect textRect = subElementRect(SE_ItemViewItemText, &optionMenuItem, widget);
 if ((option->state & State_Selected) && (option->state & State_Enabled))
 QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_ListHighlight, painter, option->rect, flags);
+QRect iconRect = subElementRect(SE_ItemViewItemDecoration, &optionMenuItem, widget);
+QRect textRect = subElementRect(SE_ItemViewItemText, &optionMenuItem, widget);
 //todo: move the vertical spacing stuff into subElementRect
 const int vSpacing = QS60StylePrivate::pixelMetric(QStyle::PM_LayoutVerticalSpacing);
 if (checkable){
+const int hSpacing = QS60StylePrivate::pixelMetric(QStyle::PM_LayoutHorizontalSpacing);
 QStyleOptionMenuItem optionCheckBox;
-optionCheckBox.QStyleOption::operator=(*menuItem);
+optionCheckBox.QStyleOptionMenuItem::operator=(*menuItem);
 optionCheckBox.rect.setWidth(pixelMetric(PM_IndicatorWidth));
 optionCheckBox.rect.setHeight(pixelMetric(PM_IndicatorHeight));
 const int moveByX = optionCheckBox.rect.width()+vSpacing;
 if (optionMenuItem.direction == Qt::LeftToRight) {
 textRect.translate(moveByX,0);
 iconRect.translate(moveByX, 0);
 iconRect.setWidth(iconRect.width()+vSpacing);
 textRect.setWidth(textRect.width()-moveByX-vSpacing);
+optionCheckBox.rect.translate(vSpacing/2, hSpacing/2);
 } else {
 textRect.setWidth(textRect.width()-moveByX);
 iconRect.setWidth(iconRect.width()+vSpacing);
 iconRect.translate(-optionCheckBox.rect.width()-vSpacing, 0);
 optionCheckBox.rect.translate(textRect.width()+iconRect.width(),0);
 arrowOptions.rect.setWidth(indicatorWidth);
 //by default sub menu indicator in S60 points to east,so here icon
 // direction is set to north (and south when in RightToLeft)
 const QS60StylePrivate::SkinElementFlag arrowDirection = (arrowOptions.direction == Qt::LeftToRight) ?
 QS60StylePrivate::SF_PointNorth : QS60StylePrivate::SF_PointSouth;
+painter->save();
+painter->setPen(option->palette.windowText().color());
 QS60StylePrivate::drawSkinPart(QS60StyleEnums::SP_QgnIndiSubMenu, painter, arrowOptions.rect,
 (flags | QS60StylePrivate::SF_ColorSkinned | arrowDirection));
+painter->restore();
 }
 //draw text
 if (!enabled){
 //In s60, if something becomes disabled, it is removed from menu, so no native look-alike available.
 case CE_MenuBarEmptyArea:
 break;
 #endif //QT_NO_MENUBAR
 case CE_HeaderSection:
-if ( const QStyleOptionHeader *header = qstyleoption_cast<const QStyleOptionHeader *>(option)) {
+if (const QStyleOptionHeader *header = qstyleoption_cast<const QStyleOptionHeader *>(option)) {
 painter->save();
 QPen linePen = QPen(QS60StylePrivate::s60Color(QS60StyleEnums::CL_QsnLineColors, 1, header));
 const int penWidth = (header->orientation == Qt::Horizontal) ?
 linePen.width()+QS60StylePrivate::pixelMetric(PM_Custom_BoldLineWidth)
 : linePen.width()+QS60StylePrivate::pixelMetric(PM_Custom_ThinLineWidth);
 } else {
 painter->drawLine(header->rect.topLeft(), header->rect.bottomLeft());
 }
 }
 painter->restore();
+//Draw corner button as normal pushButton.
+if (qobject_cast<const QAbstractButton *>(widget)) {
+//Make cornerButton slightly smaller so that it is not on top of table border graphic.
+QStyleOptionHeader subopt = *header;
+const int borderTweak =
+QS60StylePrivate::pixelMetric(PM_Custom_FrameCornerWidth)>>1;
+if (subopt.direction == Qt::LeftToRight)
+subopt.rect.adjust(borderTweak, borderTweak, 0, -borderTweak);
+else
+subopt.rect.adjust(0, borderTweak, -borderTweak, -borderTweak);
+drawPrimitive(PE_PanelButtonBevel, &subopt, painter, widget);
+} else if ((header->palette.brush(QPalette::Button) != Qt::transparent)) {
+//Draw non-themed background. Background for theme is drawn in CE_ShapedFrame
+//to get continuous theme graphic across all the header cells.
+qDrawShadePanel(painter, header->rect, header->palette,
+header->state & (State_Sunken | State_On), penWidth,
+&header->palette.brush(QPalette::Button));
+}
 }
 break;
 case CE_HeaderEmptyArea: // no need to draw this
 break;
 case CE_Header:
 }
 }
 break;
 #endif //QT_NO_TOOLBAR
 case CE_ShapedFrame:
-if (qobject_cast<const QTextEdit *>(widget)) {
+if (const QTextEdit *textEdit = qobject_cast<const QTextEdit *>(widget)) {
-QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_Editor, painter, option->rect, flags);
+const QStyleOptionFrame *frame = qstyleoption_cast<const QStyleOptionFrame *>(option);
+if (QS60StylePrivate::canDrawThemeBackground(frame->palette.base()))
+QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_Editor, painter, option->rect, flags);
+else
+QCommonStyle::drawControl(element, option, painter, widget);
 } else if (qobject_cast<const QTableView *>(widget)) {
 QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_TableItem, painter, option->rect, flags);
 } else if (const QHeaderView *header = qobject_cast<const QHeaderView *>(widget)) {
-if (header->orientation() == Qt::Horizontal) {
+//QS60style draws header background here instead of in each headersection, to get
-QRect headerRect = option->rect;
+//continuous graphic from section to section.
+QS60StylePrivate::SkinElementFlags adjustableFlags = flags;
+QRect headerRect = option->rect;
+if (header->orientation() != Qt::Horizontal) {
+//todo: update to horizontal table graphic
+adjustableFlags = (adjustableFlags | QS60StylePrivate::SF_PointWest);
+} else {
 const int frameWidth = QS60StylePrivate::pixelMetric(PM_DefaultFrameWidth);
-headerRect.adjust(0,frameWidth,-2*frameWidth,0);
+if (option->direction == Qt::LeftToRight)
-QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_TableHeaderItem, painter, headerRect, flags);
+headerRect.adjust(-2*frameWidth, 0, 0, 0);
-} else {
+else
-//todo: update to horizontal table graphic
+headerRect.adjust(0, 0, 2*frameWidth, 0);
-QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_TableHeaderItem, painter, option->rect, flags | QS60StylePrivate::SF_PointWest);
+}
-}
+if (option->palette.brush(QPalette::Button).color() == Qt::transparent)
+QS60StylePrivate::drawSkinElement(
+QS60StylePrivate::SE_TableHeaderItem, painter, headerRect, adjustableFlags);
 } else if (qobject_cast<const QFrame *>(widget)) {
 QCommonStyle::drawControl(element, option, painter, widget);
 }
 break;
 case CE_MenuScroller:
 painter->setPen(QPen(option->palette.color(QPalette::Text), penWidth));
 painter->drawRoundedRect(adjustedRect, roundRectRadius, roundRectRadius);
 painter->restore();
 }
 break;
+case CE_Splitter:
+if (option->state & State_Sunken && option->state & State_Enabled) {
+painter->save();
+painter->setOpacity(0.5);
+painter->setBrush(QS60StylePrivate::themePalette()->light());
+painter->setRenderHint(QPainter::Antialiasing);
+const qreal roundRectRadius = 4 * goldenRatio;
+painter->drawRoundedRect(option->rect, roundRectRadius, roundRectRadius);
+painter->restore();
+}
+break;
 default:
 QCommonStyle::drawControl(element, option, painter, widget);
 }
 }
 /*!
 \reimp
 */
 void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const
 {
+Q_D(const QS60Style);
 const QS60StylePrivate::SkinElementFlags flags = (option->state & State_Enabled) ?  QS60StylePrivate::SF_StateEnabled : QS60StylePrivate::SF_StateDisabled;
+bool commonStyleDraws = false;
 switch (element) {
 #ifndef QT_NO_LINEEDIT
 case PE_PanelLineEdit:
 if (const QStyleOptionFrame *lineEdit = qstyleoption_cast<const QStyleOptionFrame *>(option)) {
 #ifndef QT_NO_COMBOBOX
 if (widget && qobject_cast<const QComboBox *>(widget->parentWidget()))
 break;
 #endif
-QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_FrameLineEdit,
+if (QS60StylePrivate::canDrawThemeBackground(option->palette.base()))
-painter, option->rect, flags);
+QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_FrameLineEdit, painter, option->rect, flags);
+else
+commonStyleDraws = true;
 }
 break;
 #endif // QT_NO_LINEEDIT
 case PE_IndicatorCheckBox:
 {
-const QRect indicatorRect = option->rect;
 // Draw checkbox indicator as color skinned graphics.
 const QS60StyleEnums::SkinParts skinPart = (option->state & QStyle::State_On) ?
 QS60StyleEnums::SP_QgnIndiCheckboxOn : QS60StyleEnums::SP_QgnIndiCheckboxOff;
-QS60StylePrivate::drawSkinPart(skinPart, painter, indicatorRect,
+painter->save();
-(flags | QS60StylePrivate::SF_ColorSkinned));
+QColor themeColor = QS60StylePrivate::themePalette()->windowText().color();
+QColor windowTextColor = option->palette.windowText().color();
+if (themeColor != windowTextColor)
+painter->setPen(windowTextColor);
+QS60StylePrivate::drawSkinPart(skinPart, painter, option->rect, flags | QS60StylePrivate::SF_ColorSkinned );
+painter->restore();
 }
 break;
 case PE_IndicatorViewItemCheck:
 #ifndef QT_NO_ITEMVIEWS
 if (const QListView *listItem = (qobject_cast<const QListView *>(widget))) {
 const qreal scaler = 1 + (reduceWidth/rectWidth);
 buttonRect.setWidth((int)((buttonRect.width()-reduceWidth) * scaler));
 buttonRect.setHeight((int)(buttonRect.height() * scaler));
 // move the rect up for half of the new height-gain
 const int newY = (buttonRect.bottomRight().y() - option->rect.bottomRight().y()) >> 1 ;
-buttonRect.adjust(0,-newY,0,-newY);
+buttonRect.adjust(0, -newY, -1, -newY);
+painter->save();
+QColor themeColor = d->s60Color(QS60StyleEnums::CL_QsnTextColors, 6, option);
+QColor buttonTextColor = option->palette.buttonText().color();
+if (themeColor != buttonTextColor)
+painter->setPen(buttonTextColor);
+else
+painter->setPen(themeColor);
 // Draw radiobutton indicator as color skinned graphics.
 QS60StyleEnums::SkinParts skinPart = (option->state & QStyle::State_On) ?
 QS60StyleEnums::SP_QgnIndiRadiobuttOn : QS60StyleEnums::SP_QgnIndiRadiobuttOff;
 QS60StylePrivate::drawSkinPart(skinPart, painter, buttonRect,
 (flags | QS60StylePrivate::SF_ColorSkinned));
+painter->restore();
 }
 break;
 case PE_PanelButtonCommand:
 case PE_PanelButtonTool:
 case PE_PanelButtonBevel:
 case PE_FrameButtonBevel: {
-const bool isPressed = option->state & QStyle::State_Sunken;
+if (QS60StylePrivate::canDrawThemeBackground(option->palette.base())) {
-const QS60StylePrivate::SkinElements skinElement =
+const bool isPressed = option->state & QStyle::State_Sunken;
-isPressed ? QS60StylePrivate::SE_ButtonPressed : QS60StylePrivate::SE_ButtonNormal;
+const QS60StylePrivate::SkinElements skinElement =
-QS60StylePrivate::drawSkinElement(skinElement, painter, option->rect, flags);
+isPressed ? QS60StylePrivate::SE_ButtonPressed : QS60StylePrivate::SE_ButtonNormal;
+QS60StylePrivate::drawSkinElement(skinElement, painter, option->rect, flags);
+} else {
+commonStyleDraws = true;
+}
 }
 break;
 #ifndef QT_NO_TOOLBUTTON
 case PE_IndicatorArrowDown:
 case PE_IndicatorArrowLeft:
 #ifndef QT_NO_SPINBOX
 case PE_IndicatorSpinDown:
 case PE_IndicatorSpinUp:
 if (const QStyleOptionSpinBox *spinBox = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) {
 QStyleOptionSpinBox optionSpinBox = *spinBox;
-const QS60StyleEnums::SkinParts part = (element == PE_IndicatorSpinUp) ?
+if (QS60StylePrivate::canDrawThemeBackground(optionSpinBox.palette.base())) {
-QS60StyleEnums::SP_QgnGrafScrollArrowUp :
+const QS60StyleEnums::SkinParts part = (element == PE_IndicatorSpinUp) ?
-QS60StyleEnums::SP_QgnGrafScrollArrowDown;
+QS60StyleEnums::SP_QgnGrafScrollArrowUp :
-const int adjustment = qMin(optionSpinBox.rect.width(), optionSpinBox.rect.height())/6;
+QS60StyleEnums::SP_QgnGrafScrollArrowDown;
-optionSpinBox.rect.translate(0, (element == PE_IndicatorSpinDown) ? adjustment : -adjustment );
+const int adjustment = qMin(optionSpinBox.rect.width(), optionSpinBox.rect.height())/6;
-QS60StylePrivate::drawSkinPart(part, painter, optionSpinBox.rect,flags);
+optionSpinBox.rect.translate(0, (element == PE_IndicatorSpinDown) ? adjustment : -adjustment );
+QS60StylePrivate::drawSkinPart(part, painter, optionSpinBox.rect,flags);
+} else {
+commonStyleDraws = true;
+}
 }
 #ifndef QT_NO_COMBOBOX
 else if (const QStyleOptionFrame *cmb = qstyleoption_cast<const QStyleOptionFrame *>(option)) {
-// We want to draw down arrow here for comboboxes as well.
+if (QS60StylePrivate::canDrawThemeBackground( option->palette.base())) {
-const QS60StyleEnums::SkinParts part = QS60StyleEnums::SP_QgnGrafScrollArrowDown;
+// We want to draw down arrow here for comboboxes as well.
-QStyleOptionFrame comboBox = *cmb;
+const QS60StyleEnums::SkinParts part = QS60StyleEnums::SP_QgnGrafScrollArrowDown;
-const int adjustment = qMin(comboBox.rect.width(), comboBox.rect.height())/6;
+QStyleOptionFrame comboBox = *cmb;
-comboBox.rect.translate(0, (element == PE_IndicatorSpinDown) ? adjustment : -adjustment );
+const int adjustment = qMin(comboBox.rect.width(), comboBox.rect.height())/6;
-QS60StylePrivate::drawSkinPart(part, painter, comboBox.rect,flags);
+comboBox.rect.translate(0, (element == PE_IndicatorSpinDown) ? adjustment : -adjustment );
+QS60StylePrivate::drawSkinPart(part, painter, comboBox.rect,flags);
+} else {
+commonStyleDraws = true;
+}
 }
 #endif //QT_NO_COMBOBOX
 break;
 case PE_IndicatorSpinMinus:
 case PE_IndicatorSpinPlus:
 #endif //QT_NO_COMBOBOX
 #ifndef QT_NO_MENU
 || qobject_cast<const QMenu *> (widget)
 #endif //QT_NO_MENU
 ) {
-QS60StylePrivate::SkinElements skinElement = QS60StylePrivate::SE_OptionsMenu;
+if (QS60StylePrivate::canDrawThemeBackground(option->palette.base()))
-QS60StylePrivate::drawSkinElement(skinElement, painter, option->rect, flags);
+QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_OptionsMenu, painter, option->rect, flags);
+else
+commonStyleDraws = true;
 }
 break;
 case PE_FrameWindow:
 case PE_FrameTabWidget:
 if (const QStyleOptionTabWidgetFrame *tabFrame = qstyleoption_cast<const QStyleOptionTabWidgetFrame *>(option)) {
 } else if (upLine && downLine) {
 skinPart = QS60StyleEnums::SP_QgnIndiHlLineStraight;
 drawSkinPart = true;
 }
-if ( drawSkinPart )
+if (drawSkinPart)
 QS60StylePrivate::drawSkinPart(skinPart, painter, option->rect, flags);
 if (option->state & State_Children) {
 QS60StyleEnums::SkinParts skinPart =
 (option->state & State_Open) ? QS60StyleEnums::SP_QgnIndiHlColSuper : QS60StyleEnums::SP_QgnIndiHlExpSuper;
 QS60StylePrivate::drawSkinPart(skinPart, painter, iconRect, flags);
 }
 }
 break;
+case PE_PanelScrollAreaCorner:
+break;
 // todo: items are below with #ifdefs "just in case". in final version, remove all non-required cases
 case PE_FrameLineEdit:
-case PE_IndicatorButtonDropDown:
 case PE_IndicatorDockWidgetResizeHandle:
 case PE_PanelTipLabel:
-case PE_PanelScrollAreaCorner:
 #ifndef QT_NO_TABBAR
 case PE_IndicatorTabTear: // No tab tear in S60
 #endif // QT_NO_TABBAR
 case PE_FrameDefaultButton:
 case PE_IndicatorColumnViewArrow:
 case PE_IndicatorItemViewItemDrop:
 #endif //QT_NO_COLUMNVIEW
 case PE_FrameTabBarBase: // since tabs are in S60 always in navipane, let's use common style for tab base in Qt.
 default:
+commonStyleDraws = true;
+}
+if (commonStyleDraws) {
 QCommonStyle::drawPrimitive(element, option, painter, widget);
 }
 }
 /*! \reimp */
 {
 int metricValue = QS60StylePrivate::pixelMetric(metric);
 if (metricValue == KNotFound)
 metricValue = QCommonStyle::pixelMetric(metric, option, widget);
-if (metric == PM_SubMenuOverlap && widget){
+if (metric == PM_SubMenuOverlap && widget) {
 const QMenu *menu = qobject_cast<const QMenu *>(widget);
 if (menu && menu->activeAction() && menu->activeAction()->menu()) {
 const int menuWidth = menu->activeAction()->menu()->sizeHint().width();
 metricValue = -menuWidth;
 }
 }
+//if layout direction is mirrored, switch left and right border margins
+if (option && option->direction == Qt::RightToLeft) {
+if (metric == PM_LayoutLeftMargin)
+metricValue = QS60StylePrivate::pixelMetric(PM_LayoutRightMargin);
+else if (metric == PM_LayoutRightMargin)
+metricValue = QS60StylePrivate::pixelMetric(PM_LayoutLeftMargin);
+}
 return metricValue;
 }
 /*! \reimp */
 QSize QS60Style::sizeFromContents(ContentsType ct, const QStyleOption *opt,
 const QSize &csz, const QWidget *widget) const
 {
 QSize sz(csz);
 switch (ct) {
+case CT_ToolButton:
+sz = QCommonStyle::sizeFromContents( ct, opt, csz, widget);
+//FIXME properly - style should calculate the location of border frame-part
+sz += QSize(2*pixelMetric(PM_ButtonMargin), 2*pixelMetric(PM_ButtonMargin));
+if (const QStyleOptionToolButton *toolBtn = qstyleoption_cast<const QStyleOptionToolButton *>(opt))
+if (toolBtn->subControls & SC_ToolButtonMenu)
+sz += QSize(pixelMetric(PM_MenuButtonIndicator),0);
+break;
 case CT_PushButton:
 sz = QCommonStyle::sizeFromContents( ct, opt, csz, widget);
+//FIXME properly - style should calculate the location of border frame-part
+sz += QSize(2*pixelMetric(PM_ButtonMargin), 2*pixelMetric(PM_ButtonMargin));
 if (const QAbstractButton *buttonWidget = (qobject_cast<const QAbstractButton *>(widget)))
 if (buttonWidget->isCheckable())
 sz += QSize(pixelMetric(PM_IndicatorWidth) + pixelMetric(PM_CheckBoxLabelSpacing), 0);
 break;
 case CT_LineEdit:
 if (const QStyleOptionFrame *f = qstyleoption_cast<const QStyleOptionFrame *>(opt))
 sz += QSize(2*f->lineWidth, 4*f->lineWidth);
 break;
 case CT_TabBarTab:
-QSize naviPaneSize = QS60StylePrivate::naviPaneSize();
+{
+const QSize naviPaneSize = QS60StylePrivate::naviPaneSize();
+sz = QCommonStyle::sizeFromContents(ct, opt, csz, widget);
+if (naviPaneSize.height() > sz.height())
+sz.setHeight(naviPaneSize.height());
+}
+break;
+case CT_ItemViewItem:
 sz = QCommonStyle::sizeFromContents( ct, opt, csz, widget);
-if (naviPaneSize.height() > sz.height())
+if (QS60StylePrivate::isTouchSupported())
-sz.setHeight(naviPaneSize.height());
+//Make itemview easier to use in touch devices
+//QCommonStyle does not adjust height with horizontal margin, it only adjusts width
+sz.setHeight(sz.height() + 2*pixelMetric(QStyle::PM_FocusFrameVMargin));
 break;
 default:
 sz = QCommonStyle::sizeFromContents( ct, opt, csz, widget);
 break;
 }
 QStyleHintReturn *hret) const
 {
 int retValue = -1;
 switch (sh) {
 case SH_Table_GridLineColor:
-retValue = QS60StylePrivate::s60Color(QS60StyleEnums::CL_QsnLineColors,2,0).rgb();
+retValue = int(QS60StylePrivate::s60Color(QS60StyleEnums::CL_QsnLineColors,2,0).rgba());
 break;
 case SH_GroupBox_TextLabelColor:
-retValue = QS60StylePrivate::s60Color(QS60StyleEnums::CL_QsnTextColors,6,0).rgb();
+retValue = int(QS60StylePrivate::s60Color(QS60StyleEnums::CL_QsnTextColors,6,0).rgba());
 break;
 case SH_ScrollBar_ScrollWhenPointerLeavesControl:
 retValue = true;
 break;
 case SH_Slider_SnapToValue:
 retValue = 0;
 break;
 case SH_RequestSoftwareInputPanel:
 retValue = RSIP_OnMouseClickAndAlreadyFocused;
 break;
+case SH_FormLayoutWrapPolicy:
+retValue = QFormLayout::WrapLongRows;
+break;
 default:
-break;
+retValue = QCommonStyle::styleHint(sh, opt, widget, hret);
-}
+break;
-if (retValue == -1)
+}
-retValue = QCommonStyle::styleHint(sh, opt, widget, hret);
 return retValue;
 }
 /*! \reimp */
 QRect QS60Style::subControlRect(ComplexControl control, const QStyleOptionComplex *option, SubControl scontrol, const QWidget *widget) const
 default:
 break;
 }
 }
 break;
+case CC_ToolButton:
+if (const QStyleOptionToolButton *toolButton = qstyleoption_cast<const QStyleOptionToolButton *>(option)) {
+const int indicatorRect = pixelMetric(PM_MenuButtonIndicator) + 2*pixelMetric(PM_ButtonMargin);
+const int border = pixelMetric(PM_ButtonMargin) + pixelMetric(PM_DefaultFrameWidth);
+ret = toolButton->rect;
+const bool popup = (toolButton->features &
+(QStyleOptionToolButton::MenuButtonPopup | QStyleOptionToolButton::PopupDelay))
+== QStyleOptionToolButton::MenuButtonPopup;
+switch (scontrol) {
+case SC_ToolButton:
+if (popup)
+ret.adjust(0, 0, -indicatorRect, 0);
+break;
+case SC_ToolButtonMenu:
+if (popup)
+ret.adjust(ret.width() - indicatorRect, border, -pixelMetric(PM_ButtonMargin), -border);
+break;
+default:
+break;
+}
+ret = visualRect(toolButton->direction, toolButton->rect, ret);
+}
+break;
 default:
 ret = QCommonStyle::subControlRect(control, option, scontrol, widget);
 }
 return ret;
 }
 QRect QS60Style::subElementRect(SubElement element, const QStyleOption *opt, const QWidget *widget) const
 {
 QRect ret;
 switch (element) {
 case SE_LineEditContents: {
 // in S60 the input text box doesn't start from line Edit's TL, but
 // a bit indented.
 QRect lineEditRect = opt->rect;
 const int adjustment = opt->rect.height()>>2;
 lineEditRect.adjust(adjustment,0,0,0);
 ret = lineEditRect;
 }
 QApplication::setPalette(newPalette);
 QApplicationPrivate::setSystemPalette(d->m_originalPalette);
 }
 /*!
-Sets the style property \a name to the \a value.
-*/
-void QS60Style::setStyleProperty(const char *name, const QVariant &value)
-{
-Q_D(QS60Style);
-d->setStyleProperty_specific(name, value);
-}
-/*!
-Returns the value of style property \a name.
-*/
-QVariant QS60Style::styleProperty(const char *name) const
-{
-Q_D(const QS60Style);
-return d->styleProperty_specific(name);
-}
-/*!
 \reimp
 */
 bool QS60Style::event(QEvent *e)
 {
 #ifdef QT_KEYPAD_NAVIGATION
 default:
 return QCommonStyle::standardIconImplementation(standardIcon, option, widget);
 }
 const QS60StylePrivate::SkinElementFlags flags = adjustedFlags;
-const QPixmap cachedPixMap(QS60StylePrivate::cachedPart(part, iconSize.size(), flags));
+const QPixmap cachedPixMap(QS60StylePrivate::cachedPart(part, iconSize.size(), 0, flags));
 return cachedPixMap.isNull() ?
 QCommonStyle::standardIconImplementation(standardIcon, option, widget) : QIcon(cachedPixMap);
 }
 extern QPoint qt_s60_fill_background_offset(const QWidget *targetWidget);

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7