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

equal deleted inserted replaced

-:41300fa6a67c
+:3b1da2848fc7
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 QColor retColor (color);
 if (option && !(option->state & QStyle::State_Enabled)) {
 QColor hsvColor = retColor.toHsv();
 int colorSat = hsvColor.saturation();
 int colorVal = hsvColor.value();
-colorSat = (colorSat!=0) ? (colorSat>>1) : 128;
+colorSat = (colorSat != 0) ? (colorSat >> 1) : 128;
-colorVal = (colorVal!=0) ? (colorVal>>1) : 128;
+colorVal = (colorVal != 0) ? (colorVal >> 1) : 128;
 hsvColor.setHsv(hsvColor.hue(), colorSat, colorVal);
 retColor = hsvColor.toRgb();
 }
 return retColor;
 }
 return result;
 }
 bool QS60StylePrivate::drawsOwnThemeBackground(const QWidget *widget)
 {
-return qobject_cast<const QDialog *> (widget);
+return (widget ? (widget->windowType() == Qt::Dialog) : false);
 }
 QFont QS60StylePrivate::s60Font(
-QS60StyleEnums::FontCategories fontCategory, int pointSize) const
+QS60StyleEnums::FontCategories fontCategory,
+int pointSize, bool resolveFontSize) const
 {
 QFont result;
 int actualPointSize = pointSize;
 if (actualPointSize <= 0) {
 const QFont appFont = QApplication::font();
 actualPointSize = appFont.pixelSize() * 72 / qt_defaultDpiY();
 }
 Q_ASSERT(actualPointSize > 0);
 const QPair<QS60StyleEnums::FontCategories, int> key(fontCategory, actualPointSize);
 if (!m_mappedFontsCache.contains(key)) {
-result = s60Font_specific(fontCategory, actualPointSize);
+result = s60Font_specific(fontCategory, actualPointSize, resolveFontSize);
 m_mappedFontsCache.insert(key, result);
 } else {
 result = m_mappedFontsCache.value(key);
 if (result.pointSize() != actualPointSize)
 result.setPointSize(actualPointSize);
 {
 switch(reason){
 case CC_LayoutChange:
 // when layout changes, the colors remain in cache, but graphics and fonts can change
 m_mappedFontsCache.clear();
-deleteBackground();
 QPixmapCache::clear();
 break;
 case CC_ThemeChange:
 m_colorCache.clear();
 QPixmapCache::clear();
 {
 const bool cachedColorExists = m_colorCache.contains(frame);
 if (!cachedColorExists) {
 const int frameCornerWidth = pixelMetric(PM_Custom_FrameCornerWidth);
 const int frameCornerHeight = pixelMetric(PM_Custom_FrameCornerHeight);
-Q_ASSERT(2*frameCornerWidth<32);
+Q_ASSERT(2 * frameCornerWidth < 32);
-Q_ASSERT(2*frameCornerHeight<32);
+Q_ASSERT(2 * frameCornerHeight < 32);
-const QImage frameImage = QS60StylePrivate::frame(frame, QSize(32,32)).toImage();
+const QImage frameImage = QS60StylePrivate::frame(frame, QSize(32, 32)).toImage();
 Q_ASSERT(frameImage.bytesPerLine() > 0);
 if (frameImage.isNull())
 return Qt::black;
 const QRgb *pixelRgb = (const QRgb*)frameImage.bits();
 int estimatedBlue = 0;
 int skips = 0;
 int estimations = 0;
-const int topBorderLastPixel = frameCornerHeight*frameImage.width()-1;
+const int topBorderLastPixel = frameCornerHeight*frameImage.width() - 1;
-const int bottomBorderFirstPixel = frameImage.width()*frameImage.height()-frameCornerHeight*frameImage.width()-1;
+const int bottomBorderFirstPixel = frameImage.width() * frameImage.height() - frameCornerHeight*frameImage.width() - 1;
-const int rightBorderFirstPixel = frameImage.width()-frameCornerWidth;
+const int rightBorderFirstPixel = frameImage.width() - frameCornerWidth;
 const int leftBorderLastPixel = frameCornerWidth;
 while ((skips + estimations) < pixels) {
-if ((skips+estimations) > topBorderLastPixel &&
+if ((skips + estimations) > topBorderLastPixel &&
-(skips+estimations) < bottomBorderFirstPixel) {
+(skips + estimations) < bottomBorderFirstPixel) {
 for (int rowIndex = 0; rowIndex < frameImage.width(); rowIndex++) {
 if (rowIndex > leftBorderLastPixel &&
 rowIndex < rightBorderFirstPixel) {
 estimatedRed += qRed(*pixelRgb);
 estimatedGreen += qGreen(*pixelRgb);
 if (orientation == Qt::Horizontal) {
 startRect.setWidth(qMin((rect.width() >> 1) - 1, startRect.width()));
 endRect = startRect.translated(rect.width() - startRect.width(), 0);
 middleRect.adjust(startRect.width(), 0, -startRect.width(), 0);
 if (startRect.bottomRight().x() > endRect.topLeft().x()) {
-const int overlap = (startRect.bottomRight().x() -  endRect.topLeft().x())>>1;
+const int overlap = (startRect.bottomRight().x() -  endRect.topLeft().x()) >> 1;
-startRect.setWidth(startRect.width()-overlap);
+startRect.setWidth(startRect.width() - overlap);
-endRect.adjust(overlap,0,0,0);
+endRect.adjust(overlap, 0, 0, 0);
 }
 } else {
 startRect.setHeight(qMin((rect.height() >> 1) - 1, startRect.height()));
 endRect = startRect.translated(0, rect.height() - startRect.height());
 middleRect.adjust(0, startRect.height(), 0, -startRect.height());
 if (startRect.topRight().y() > endRect.bottomLeft().y()) {
-const int overlap = (startRect.topRight().y() - endRect.bottomLeft().y())>>1;
+const int overlap = (startRect.topRight().y() - endRect.bottomLeft().y()) >> 1;
-startRect.setHeight(startRect.height()-overlap);
+startRect.setHeight(startRect.height() - overlap);
-endRect.adjust(0,overlap,0,0);
+endRect.adjust(0, overlap, 0, 0);
 }
 }
 #if 0
 painter->save();
 fontCategory = QS60StyleEnums::FC_Secondary;
 } else if (qobject_cast<QGroupBox *>(widget)){
 fontCategory = QS60StyleEnums::FC_Title;
 }
 if (fontCategory != QS60StyleEnums::FC_Undefined) {
+const bool resolveFontSize = widget->testAttribute(Qt::WA_SetFont)
+&& (widget->font().resolve() & QFont::SizeResolved);
 const QFont suggestedFont =
-s60Font(fontCategory, widget->font().pointSizeF());
+s60Font(fontCategory, widget->font().pointSizeF(), resolveFontSize);
 widget->setFont(suggestedFont);
 }
 }
 void QS60StylePrivate::setThemePalette(QWidget *widget) const
 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(result.height()>>1);
+result.setWidth(result.height() >> 1);
 break;
 case QS60StyleEnums::SP_QgnGrafNsliderEndLeft:
 case QS60StyleEnums::SP_QgnGrafNsliderEndRight:
 case QS60StyleEnums::SP_QgnGrafNsliderMiddle:
-result.setWidth(result.height()>>1);
+result.setWidth(result.height() >> 1);
 break;
 case QS60StyleEnums::SP_QgnGrafNsliderMarker:
 case QS60StyleEnums::SP_QgnGrafNsliderMarkerSelected:
 result.scale(pixelMetric(QStyle::PM_SliderLength),
 // Button frame
 QStyleOptionFrame  buttonOption;
 buttonOption.QStyleOption::operator=(*cmb);
 const int maxHeight = cmbxFrame.height();
 const int maxWidth = cmbxFrame.width() - cmbxEditField.width();
-const int topLeftPoint = direction ? cmbxEditField.right()+1 : cmbxEditField.left()+1-maxWidth;
+const int topLeftPoint = direction ?
+(cmbxEditField.right() + 1) : (cmbxEditField.left() + 1 - maxWidth);
 const QRect buttonRect(topLeftPoint, cmbxEditField.top(), maxWidth, maxHeight);
 buttonOption.rect = buttonRect;
-buttonOption.state = cmb->state & (State_Enabled | State_MouseOver);
+buttonOption.state = cmb->state;
 drawPrimitive(PE_PanelButtonCommand, &buttonOption, painter, widget);
 // draw label background - label itself is drawn separately
 const QS60StylePrivate::SkinElements skinElement = QS60StylePrivate::SE_FrameLineEdit;
 QS60StylePrivate::drawSkinElement(skinElement, painter, cmbxEditField, flags);
 scrollBarWidth = scrollBar->size().width();
 break;
 }
 }
-int rightValue = widget ? widget->contentsRect().right() : 0;
+int rightValue = widget ? widget->contentsRect().right() : voptAdj.rect.right();
 if (isScrollBarVisible)
 rightValue -= scrollBarWidth;
 if (voptAdj.rect.right() > rightValue)
 if (vopt->backgroundBrush == Qt::NoBrush) {
 if (itemView) {
 const QModelIndex index = vopt->index;
 //todo: Draw cell background only once - for the first cell.
 QStyleOptionViewItemV4 voptAdj2 = voptAdj;
-const QModelIndex indexFirst = itemView->model()->index(0,0);
+const QModelIndex indexFirst = itemView->model()->index(0, 0);
 const QModelIndex indexLast = itemView->model()->index(
-itemView->model()->rowCount()-1,itemView->model()->columnCount()-1);
+itemView->model()->rowCount() - 1, itemView->model()->columnCount() -1);
 if (itemView->viewport())
 voptAdj2.rect = QRect( itemView->visualRect(indexFirst).topLeft(),
 itemView->visualRect(indexLast).bottomRight()).intersect(itemView->viewport()->rect());
 drawPrimitive(PE_PanelItemViewItem, &voptAdj, painter, widget);
 }
 painter->save();
 QFont f = painter->font();
 f.setPointSizeF(f.pointSizeF() * KTabFontMul);
 painter->setFont(f);
-if (option->state & QStyle::State_Selected){
+const bool selected = optionTab.state & State_Selected;
+if (selected)
 optionTab.palette.setColor(QPalette::Active, QPalette::WindowText,
 QS60StylePrivate::s60Color(QS60StyleEnums::CL_QsnTextColors, 3, option));
-}
 const bool verticalTabs = optionTab.shape == QTabBar::RoundedEast
 || optionTab.shape == QTabBar::RoundedWest
 || optionTab.shape == QTabBar::TriangularEast
 || optionTab.shape == QTabBar::TriangularWest;
-const bool selected = optionTab.state & State_Selected;
 if (verticalTabs) {
 painter->save();
 int newX, newY, newRotation;
 if (optionTab.shape == QTabBar::RoundedEast || optionTab.shape == QTabBar::TriangularEast) {
 newX = tr.width();
 if (iconSize.height() > iconExtent || iconSize.width() > iconExtent)
 iconSize = QSize(iconExtent, iconExtent);
 QPixmap tabIcon = optionTab.icon.pixmap(iconSize,
 (optionTab.state & State_Enabled) ? QIcon::Normal : QIcon::Disabled);
 if (tab->text.isEmpty())
-painter->drawPixmap(tr.center().x() - (tabIcon.height() >>1),
+painter->drawPixmap(tr.center().x() - (tabIcon.height() >> 1),
-tr.center().y() - (tabIcon.height() >>1),
+tr.center().y() - (tabIcon.height() >> 1),
 tabIcon);
 else
 painter->drawPixmap(tr.left() + tabOverlap,
-tr.center().y() - (tabIcon.height() >>1),
+tr.center().y() - (tabIcon.height() >> 1),
 tabIcon);
 tr.setLeft(tr.left() + iconSize.width() + 4);
 }
 QCommonStyle::drawItemText(painter, tr, alignment, optionTab.palette, tab->state & State_Enabled, tab->text, QPalette::WindowText);
 const qreal progressFactor = (optionProgressBar->minimum == optionProgressBar->maximum) ? 1.0
 : (qreal)optionProgressBar->progress / optionProgressBar->maximum;
 if (optionProgressBar->orientation == Qt::Horizontal) {
 progressRect.setWidth(int(progressRect.width() * progressFactor));
 if(optionProgressBar->direction == Qt::RightToLeft)
-progressRect.translate(optionProgressBar->rect.width()-progressRect.width(),0);
+progressRect.translate(optionProgressBar->rect.width()-progressRect.width(), 0);
 progressRect.adjust(1, 0, -1, 0);
 } else {
 progressRect.adjust(0, 1, 0, -1);
 progressRect.setTop(progressRect.bottom() - int(progressRect.height() * progressFactor));
 }
 const int hSpacing = QS60StylePrivate::pixelMetric(QStyle::PM_LayoutHorizontalSpacing);
 QStyleOptionMenuItem optionCheckBox;
 optionCheckBox.QStyleOptionMenuItem::operator=(*menuItem);
 optionCheckBox.rect.setWidth(pixelMetric(PM_IndicatorWidth));
 optionCheckBox.rect.setHeight(pixelMetric(PM_IndicatorHeight));
-const int moveByX = optionCheckBox.rect.width()+vSpacing;
+const int moveByX = optionCheckBox.rect.width() + vSpacing;
 if (optionMenuItem.direction == Qt::LeftToRight) {
-textRect.translate(moveByX,0);
+textRect.translate(moveByX, 0);
 iconRect.translate(moveByX, 0);
-iconRect.setWidth(iconRect.width()+vSpacing);
+iconRect.setWidth(iconRect.width() + vSpacing);
-textRect.setWidth(textRect.width()-moveByX-vSpacing);
+textRect.setWidth(textRect.width() - moveByX - vSpacing);
-optionCheckBox.rect.translate(vSpacing/2, hSpacing/2);
+optionCheckBox.rect.translate(vSpacing >> 1, hSpacing >> 1);
 } else {
-textRect.setWidth(textRect.width()-moveByX);
+textRect.setWidth(textRect.width() - moveByX);
-iconRect.setWidth(iconRect.width()+vSpacing);
+iconRect.setWidth(iconRect.width() + vSpacing);
-iconRect.translate(-optionCheckBox.rect.width()-vSpacing, 0);
+iconRect.translate(-optionCheckBox.rect.width() - vSpacing, 0);
-optionCheckBox.rect.translate(textRect.width()+iconRect.width(),0);
+optionCheckBox.rect.translate(textRect.width() + iconRect.width(), 0);
 }
 drawPrimitive(PE_IndicatorMenuCheckMark, &optionCheckBox, painter, widget);
 }
 //draw icon and/or checkState
 QPixmap pix = menuItem->icon.pixmap(pixelMetric(PM_SmallIconSize),
 enabled ? QIcon::Normal : QIcon::Disabled);
 const bool itemWithIcon = !pix.isNull();
 if (itemWithIcon) {
 drawItemPixmap(painter, iconRect, text_flags, pix);
 if (optionMenuItem.direction == Qt::LeftToRight)
-textRect.translate(vSpacing,0);
+textRect.translate(vSpacing, 0);
 else
-textRect.translate(-vSpacing,0);
+textRect.translate(-vSpacing, 0);
 textRect.setWidth(textRect.width()-vSpacing);
 }
 //draw indicators
 if (drawSubMenuIndicator) {
 QStyleOptionMenuItem arrowOptions;
 arrowOptions.QStyleOption::operator=(*menuItem);
-const int indicatorWidth = (pixelMetric(PM_ListViewIconSize, option, widget)>>1) +
+const int indicatorWidth = (pixelMetric(PM_ListViewIconSize, option, widget) >> 1) +
 pixelMetric(QStyle::PM_LayoutVerticalSpacing, option, widget);
 if (optionMenuItem.direction == Qt::LeftToRight)
 arrowOptions.rect.setLeft(textRect.right());
 arrowOptions.rect.setWidth(indicatorWidth);
 //by default sub menu indicator in S60 points to east,so here icon
 case CE_HeaderSection:
 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_BoldLineWidth)
-: linePen.width()+QS60StylePrivate::pixelMetric(PM_Custom_ThinLineWidth);
+: linePen.width() + QS60StylePrivate::pixelMetric(PM_Custom_ThinLineWidth);
 linePen.setWidth(penWidth);
 painter->setPen(linePen);
 if (header->orientation == Qt::Horizontal){
 painter->drawLine(header->rect.bottomLeft(), header->rect.bottomRight());
 } else {
 //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;
+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);
 //todo: update to horizontal table graphic
 adjustableFlags = (adjustableFlags | QS60StylePrivate::SF_PointWest);
 } else {
 const int frameWidth = QS60StylePrivate::pixelMetric(PM_DefaultFrameWidth);
 if (option->direction == Qt::LeftToRight)
-headerRect.adjust(-2*frameWidth, 0, 0, 0);
+headerRect.adjust(-2 * frameWidth, 0, 0, 0);
 else
-headerRect.adjust(0, 0, 2*frameWidth, 0);
+headerRect.adjust(0, 0, 2 * frameWidth, 0);
 }
 if (option->palette.brush(QPalette::Button).color() == Qt::transparent)
 QS60StylePrivate::drawSkinElement(
 QS60StylePrivate::SE_TableHeaderItem, painter, headerRect, adjustableFlags);
 // ... or normal "tick" selection at the end.
 } else if (option->state & QStyle::State_Selected) {
 QRect tickRect = option->rect;
 const int frameBorderWidth = QS60StylePrivate::pixelMetric(PM_Custom_FrameCornerWidth);
 // adjust tickmark rect to exclude frame border
-tickRect.adjust(0,-frameBorderWidth,0,-frameBorderWidth);
+tickRect.adjust(0, -frameBorderWidth, 0, -frameBorderWidth);
 QS60StyleEnums::SkinParts skinPart = QS60StyleEnums::SP_QgnIndiMarkedAdd;
 QS60StylePrivate::drawSkinPart(skinPart, painter, tickRect,
 (flags | QS60StylePrivate::SF_ColorSkinned));
 }
 }
 #endif //QT_NO_ITEMVIEWS
 break;
 case PE_IndicatorRadioButton: {
 QRect buttonRect = option->rect;
 //there is empty (a. 33%) space in svg graphics for radiobutton
-const qreal reduceWidth = (qreal)buttonRect.width()/3.0;
+const qreal reduceWidth = (qreal)buttonRect.width() / 3.0;
 const qreal rectWidth = (qreal)option->rect.width() != 0 ? option->rect.width() : 1.0;
 // Try to occupy the full area
 const qreal scaler = 1 + (reduceWidth/rectWidth);
 buttonRect.setWidth((int)((buttonRect.width()-reduceWidth) * scaler));
 buttonRect.setHeight((int)(buttonRect.height() * scaler));
 #endif //QT_NO_TOOLBUTTON
 #ifndef QT_NO_SPINBOX
 case PE_IndicatorSpinDown:
 case PE_IndicatorSpinUp:
 if (const QStyleOptionSpinBox *spinBox = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) {
-QStyleOptionSpinBox optionSpinBox = *spinBox;
+if (QS60StylePrivate::canDrawThemeBackground(spinBox->palette.base())) {
-if (QS60StylePrivate::canDrawThemeBackground(optionSpinBox.palette.base())) {
+QStyleOptionSpinBox optionSpinBox = *spinBox;
 const QS60StyleEnums::SkinParts part = (element == PE_IndicatorSpinUp) ?
 QS60StyleEnums::SP_QgnGrafScrollArrowUp :
 QS60StyleEnums::SP_QgnGrafScrollArrowDown;
-const int adjustment = qMin(optionSpinBox.rect.width(), optionSpinBox.rect.height())/6;
+const int iconMargin = QS60StylePrivate::pixelMetric(PM_Custom_FrameCornerWidth) >> 1;
-optionSpinBox.rect.translate(0, (element == PE_IndicatorSpinDown) ? adjustment : -adjustment );
+optionSpinBox.rect.translate(0, (element == PE_IndicatorSpinDown) ? iconMargin : -iconMargin );
-QS60StylePrivate::drawSkinPart(part, painter, optionSpinBox.rect,flags);
+QS60StylePrivate::drawSkinPart(part, painter, optionSpinBox.rect, flags);
 } else {
 commonStyleDraws = true;
 }
 }
+#endif //QT_NO_SPINBOX
 #ifndef QT_NO_COMBOBOX
-else if (const QStyleOptionFrame *cmb = qstyleoption_cast<const QStyleOptionFrame *>(option)) {
+if (const QStyleOptionFrame *cmb = qstyleoption_cast<const QStyleOptionFrame *>(option)) {
 if (QS60StylePrivate::canDrawThemeBackground( option->palette.base())) {
 // We want to draw down arrow here for comboboxes as well.
+QStyleOptionFrame optionsComboBox = *cmb;
 const QS60StyleEnums::SkinParts part = QS60StyleEnums::SP_QgnGrafScrollArrowDown;
-QStyleOptionFrame comboBox = *cmb;
+const int iconMargin = QS60StylePrivate::pixelMetric(PM_Custom_FrameCornerWidth) >> 1;
-const int adjustment = qMin(comboBox.rect.width(), comboBox.rect.height())/6;
+optionsComboBox.rect.translate(0, (element == PE_IndicatorSpinDown) ? iconMargin : -iconMargin );
-comboBox.rect.translate(0, (element == PE_IndicatorSpinDown) ? adjustment : -adjustment );
+QS60StylePrivate::drawSkinPart(part, painter, optionsComboBox.rect, flags);
-QS60StylePrivate::drawSkinPart(part, painter, comboBox.rect,flags);
 } else {
 commonStyleDraws = true;
 }
 }
 #endif //QT_NO_COMBOBOX
 #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.
 QStyleOptionFrame comboBox = *cmb;
 const int frameWidth = QS60StylePrivate::pixelMetric(PM_DefaultFrameWidth);
-comboBox.rect.adjust(0,frameWidth,0,-frameWidth);
+comboBox.rect.adjust(0, frameWidth, 0, -frameWidth);
 QCommonStyle::drawPrimitive(element, &comboBox, painter, widget);
 }
 #endif //QT_NO_COMBOBOX
 break;
-#endif //QT_NO_SPINBOX
 case PE_Widget:
 if (QS60StylePrivate::drawsOwnThemeBackground(widget)
 #ifndef QT_NO_COMBOBOX
 || qobject_cast<const QComboBoxListView *>(widget)
 #endif //QT_NO_COMBOBOX
 #ifndef QT_NO_MENU
 || qobject_cast<const QMenu *> (widget)
 #endif //QT_NO_MENU
 ) {
-if (QS60StylePrivate::canDrawThemeBackground(option->palette.base()))
+//Need extra check since dialogs have their own theme background
+if (QS60StylePrivate::canDrawThemeBackground(option->palette.base()) &&
+option->palette.window().texture().cacheKey() ==
+QS60StylePrivate::m_themePalette->window().texture().cacheKey())
 QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_OptionsMenu, painter, option->rect, flags);
 else
 commonStyleDraws = true;
 }
 break;
 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));
+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);
+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));
+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);
+sz += QSize(2 * f->lineWidth, 4 * f->lineWidth);
 break;
 case CT_TabBarTab:
 {
 const QSize naviPaneSize = QS60StylePrivate::naviPaneSize();
 sz = QCommonStyle::sizeFromContents(ct, opt, csz, widget);
 case CT_ItemViewItem:
 sz = QCommonStyle::sizeFromContents( ct, opt, csz, widget);
 if (QS60StylePrivate::isTouchSupported())
 //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));
+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 = int(QS60StylePrivate::s60Color(QS60StyleEnums::CL_QsnLineColors,2,0).rgba());
+retValue = int(QS60StylePrivate::s60Color(QS60StyleEnums::CL_QsnLineColors, 2, 0).rgba());
 break;
 case SH_GroupBox_TextLabelColor:
-retValue = int(QS60StylePrivate::s60Color(QS60StyleEnums::CL_QsnTextColors,6,0).rgba());
+retValue = int(QS60StylePrivate::s60Color(QS60StyleEnums::CL_QsnTextColors, 6, 0).rgba());
 break;
 case SH_ScrollBar_ScrollWhenPointerLeavesControl:
 retValue = true;
 break;
 case SH_Slider_SnapToValue:
 if (scrollbarOption->maximum != scrollbarOption->minimum) {
 const uint range = scrollbarOption->maximum - scrollbarOption->minimum;
 sliderlen = (qint64(scrollbarOption->pageStep) * maxlen) / (range + scrollbarOption->pageStep);
 const int slidermin = pixelMetric(PM_ScrollBarSliderMin, scrollbarOption, widget);
-if (sliderlen < slidermin || range > (INT_MAX>>1))
+if (sliderlen < slidermin || range > (INT_MAX >> 1))
 sliderlen = slidermin;
 if (sliderlen > maxlen)
 sliderlen = maxlen;
 } else {
 sliderlen = maxlen;
 #endif // QT_NO_SCROLLBAR
 case CC_SpinBox:
 if (const QStyleOptionSpinBox *spinbox = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) {
 const int frameThickness = spinbox->frame ? pixelMetric(PM_SpinBoxFrameWidth, spinbox, widget) : 0;
 const int buttonMargin = spinbox->frame ? 2 : 0;
-const int buttonWidth = QS60StylePrivate::pixelMetric(QStyle::PM_ButtonIconSize) + 2*buttonMargin;
+const int buttonWidth = QS60StylePrivate::pixelMetric(QStyle::PM_ButtonIconSize) + 2 * buttonMargin;
 QSize buttonSize;
 buttonSize.setHeight(qMax(8, spinbox->rect.height() - frameThickness));
-buttonSize.setWidth(buttonWidth);
+//width should at least be equal to height
+buttonSize.setWidth(qMax(buttonSize.height(), buttonWidth));
 buttonSize = buttonSize.expandedTo(QApplication::globalStrut());
 const int y = frameThickness + spinbox->rect.y();
-const int x = spinbox->rect.x() + spinbox->rect.width() - frameThickness - 2*buttonSize.width();
+const int x = spinbox->rect.x() + spinbox->rect.width() - frameThickness - 2 * buttonSize.width();
 switch (scontrol) {
 case SC_SpinBoxUp:
 if (spinbox->buttonSymbols == QAbstractSpinBox::NoButtons)
 return QRect();
-ret = QRect(x, y, buttonWidth, buttonSize.height());
+ret = QRect(x, y, buttonSize.width(), buttonSize.height());
 break;
 case SC_SpinBoxDown:
 if (spinbox->buttonSymbols == QAbstractSpinBox::NoButtons)
 return QRect();
-ret = QRect(x+buttonSize.width(), y, buttonWidth, buttonSize.height());
+ret = QRect(x + buttonSize.width(), y, buttonSize.width(), buttonSize.height());
 break;
 case SC_SpinBoxEditField:
 if (spinbox->buttonSymbols == QAbstractSpinBox::NoButtons)
 ret = QRect(
 frameThickness,
 frameThickness,
-spinbox->rect.width() - 2*frameThickness,
+spinbox->rect.width() - 2 * frameThickness,
-spinbox->rect.height() - 2*frameThickness);
+spinbox->rect.height() - 2 * frameThickness);
 else
 ret = QRect(
 frameThickness,
 frameThickness,
 x - frameThickness,
-spinbox->rect.height() - 2*frameThickness);
+spinbox->rect.height() - 2 * frameThickness);
 break;
 case SC_SpinBoxFrame:
 ret = spinbox->rect;
 break;
 default:
 case CC_ComboBox:
 if (const QStyleOptionComboBox *cmb = qstyleoption_cast<const QStyleOptionComboBox *>(option)) {
 ret = cmb->rect;
 const int width = cmb->rect.width();
 const int height = cmb->rect.height();
+const int buttonIconSize = QS60StylePrivate::pixelMetric(QStyle::PM_ButtonIconSize);
 const int buttonMargin = cmb->frame ? 2 : 0;
 // lets use spinbox frame here as well, as no combobox specific value available.
 const int frameThickness = cmb->frame ? pixelMetric(PM_SpinBoxFrameWidth, cmb, widget) : 0;
-const int buttonWidth = QS60StylePrivate::pixelMetric(QStyle::PM_ButtonIconSize);
+const int buttonWidth = qMax(cmb->rect.height(), buttonIconSize);
+const int xposMod = (cmb->rect.x()) + width - buttonMargin - buttonWidth;
+const int ypos = cmb->rect.y();
 QSize buttonSize;
-buttonSize.setHeight(qMax(8, (cmb->rect.height()>>1) - frameThickness)); //minimum of 8 pixels
+buttonSize.setWidth(buttonWidth + 2 * buttonMargin);
-buttonSize.setWidth(buttonWidth+2*buttonMargin);
+buttonSize.setHeight(qMax(8, (cmb->rect.height() >> 1) - frameThickness)); //buttons should be squares
 buttonSize = buttonSize.expandedTo(QApplication::globalStrut());
 switch (scontrol) {
 case SC_ComboBoxArrow:
-ret.setRect(
+ret.setRect(xposMod, ypos + buttonMargin, buttonWidth, height - 2 * buttonMargin);
-ret.x() + ret.width() - buttonMargin - buttonWidth,
-ret.y() + buttonMargin,
-buttonWidth,
-height - 2*buttonMargin);
 break;
 case SC_ComboBoxEditField: {
-ret.setRect(
+const int withFrameX = cmb->rect.x() + cmb->rect.width() - frameThickness - buttonSize.width();
-ret.x() + frameThickness,
+ret = QRect(
-ret.y() + frameThickness,
+frameThickness,
-ret.width() - 2*frameThickness - buttonSize.width(),
+frameThickness,
-ret.height() - 2*frameThickness);
+withFrameX - frameThickness,
+cmb->rect.height() - 2 * frameThickness);
 }
 break;
 default:
 break;
 }
 case SC_GroupBoxCheckBox: //fallthrough
 case SC_GroupBoxLabel: {
 //slightly indent text and boxes, so that dialog border does not mess with them.
 const int horizontalSpacing =
 QS60StylePrivate::pixelMetric(QStyle::PM_LayoutHorizontalSpacing);
-ret.adjust(2,horizontalSpacing-3,0,0);
+ret.adjust(2, horizontalSpacing - 3, 0, 0);
 }
 break;
 case SC_GroupBoxFrame: {
 const QRect textBox = subControlRect(control, option, SC_GroupBoxLabel, widget);
 const int tbHeight = textBox.height();
 ret.translate(0, -ret.y());
 // include title to within the groupBox frame
-ret.setHeight(ret.height()+tbHeight);
+ret.setHeight(ret.height() + tbHeight);
 if (widget && ret.bottom() > widget->rect().bottom())
 ret.setBottom(widget->rect().bottom());
 }
 break;
 default:
 }
 }
 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 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 (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;
+const int adjustment = opt->rect.height() >> 2;
-lineEditRect.adjust(adjustment,0,0,0);
+lineEditRect.adjust(adjustment, 0, 0, 0);
 ret = lineEditRect;
 }
 break;
 case SE_TabBarTearIndicator:
-ret = QRect(0,0,0,0);
+ret = QRect(0, 0, 0, 0);
 break;
 case SE_TabWidgetTabBar:
 if (const QStyleOptionTabWidgetFrame *optionTab = qstyleoption_cast<const QStyleOptionTabWidgetFrame *>(opt)) {
 ret = QCommonStyle::subElementRect(element, opt, widget);
 case QTabBar::TriangularSouth: {
 if (widget) {
 // make sure that gain does not set the rect outside of widget boundaries
 if (twf->direction == Qt::RightToLeft) {
 if ((ret.left() - gain) < widget->rect().left())
-gain = widget->rect().left()-ret.left();
+gain = widget->rect().left() - ret.left();
-ret.adjust(-gain,0,0,0);
+ret.adjust(-gain, 0, 0, 0);
 } else {
 if ((ret.right() + gain) > widget->rect().right())
-gain = widget->rect().right()-ret.right();
+gain = widget->rect().right() - ret.right();
-ret.adjust(0,0,gain,0);
+ret.adjust(0, 0, gain, 0);
 }
 }
 break;
 }
 default: {
 if (widget) {
 if ((ret.bottom() + gain) > widget->rect().bottom())
-gain = widget->rect().bottom()-ret.bottom();
+gain = widget->rect().bottom() - ret.bottom();
-ret.adjust(0,0,0,gain);
+ret.adjust(0, 0, 0, gain);
 }
 break;
 }
 }
 }
 (vopt->features & QStyleOptionViewItemV2::HasCheckIndicator)) {
 const int verticalSpacing =
 QS60StylePrivate::pixelMetric(QStyle::PM_LayoutVerticalSpacing);
 //const int horizontalSpacing = QS60StylePrivate::pixelMetric(QStyle::PM_LayoutHorizontalSpacing);
 const int checkBoxRectWidth = subElementRect(SE_ItemViewItemCheckIndicator, opt, widget).width();
-ret.adjust(-checkBoxRectWidth-verticalSpacing,0,-checkBoxRectWidth-verticalSpacing,0);
+ret.adjust(-checkBoxRectWidth - verticalSpacing, 0, -checkBoxRectWidth - verticalSpacing, 0);
 }
 } else if (const QStyleOptionMenuItem *menuItem = qstyleoption_cast<const QStyleOptionMenuItem *>(opt)) {
 const bool checkable = menuItem->checkType != QStyleOptionMenuItem::NotCheckable;
 const int indicatorWidth = checkable ?
 pixelMetric(PM_ListViewIconSize, opt, widget) :
 // Make room for submenu indicator
 if (menuItem->menuItemType == QStyleOptionMenuItem::SubMenu){
 // submenu indicator is very small, so lets halve the rect
 if (menuItem->direction == Qt::LeftToRight)
-ret.adjust(0,0,-(indicatorWidth >> 1),0);
+ret.adjust(0, 0, -(indicatorWidth >> 1), 0);
 else
-ret.adjust((indicatorWidth >> 1),0,0,0);
+ret.adjust((indicatorWidth >> 1), 0, 0, 0);
 }
 }
 }
 break;
 case SE_ItemViewItemCheckIndicator:
 const int spacing = QS60StylePrivate::pixelMetric(QStyle::PM_CheckBoxLabelSpacing);
 const int itemHeight = opt->rect.height();
 int heightOffset = 0;
 if (indicatorHeight < itemHeight)
-heightOffset = ((itemHeight - indicatorHeight)>>1);
+heightOffset = ((itemHeight - indicatorHeight) >> 1);
 if (checkBoxOnly) {
 // Move rect and make it slightly smaller, so that
 // a) highlight border does not cross the rect
 // b) in s60 list checkbox is smaller than normal checkbox
 //todo; magic three
-ret.setRect(opt->rect.left()+3, opt->rect.top() + heightOffset,
+ret.setRect(opt->rect.left() + 3, opt->rect.top() + heightOffset,
-indicatorWidth-3, indicatorHeight-3);
+indicatorWidth - 3, indicatorHeight - 3);
 } else {
 ret.setRect(opt->rect.right() - indicatorWidth - spacing, opt->rect.top() + heightOffset,
 indicatorWidth, indicatorHeight);
 }
 } else  {
 */
 QIcon QS60Style::standardIconImplementation(StandardPixmap standardIcon,
 const QStyleOption *option, const QWidget *widget) const
 {
 const int iconDimension = QS60StylePrivate::pixelMetric(QStyle::PM_ToolBarIconSize);
-const QRect iconSize = (!option) ? QRect(0,0,iconDimension,iconDimension) : option->rect;
+const QRect iconSize = (!option) ? QRect(0, 0, iconDimension, iconDimension) : option->rect;
 QS60StyleEnums::SkinParts part;
 QS60StylePrivate::SkinElementFlags adjustedFlags;
 if (option)
 adjustedFlags = (option->state & State_Enabled || option->state == 0) ?
 QS60StylePrivate::SF_StateEnabled :

branch	RCL_3
changeset 4	3b1da2848fc7
parent 3	41300fa6a67c
child 5	d3bac044e0f0