MCL/sf/mw/qt: comparison src/gui/styles/qgtkstyle.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.
 **
 resolve_mask & (1 << QPalette::Base)) // Palette overridden by user
 p->fillRect(contentRect, option->palette.base().color());
 else {
 gtkCachedPainter.paintFlatBox(gtkEntry, "entry_bg", contentRect,
 option->state & State_Enabled ? GTK_STATE_NORMAL : GTK_STATE_INSENSITIVE,
-GTK_SHADOW_NONE, gtkCombo->style, entryPath + QString::number(focus));
+GTK_SHADOW_NONE, gtkEntry->style, entryPath + QString::number(focus));
 }
 gtkCachedPainter.paintShadow(gtkEntry, comboBox->editable ? "entry" : "frame", frameRect, frameState,
 GTK_SHADOW_IN, gtkEntry->style, entryPath +
 QString::number(focus) + QString::number(comboBox->editable) +
 #endif //QT_NO_SCROLLBAR
 #ifndef QT_NO_SPINBOX
 case CC_SpinBox:
 if (const QStyleOptionSpinBox *spinBox = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) {
-GtkWidget *gtkSpinButton = d->gtkWidget(QLS("GtkSpinButton"));
+GtkWidget *gtkSpinButton = d->gtkWidget(
+spinBox->buttonSymbols == QAbstractSpinBox::NoButtons ?
+QLS("GtkEntry") :
+QLS("GtkSpinButton"));
 bool isEnabled = (spinBox->state & State_Enabled);
 bool hover = isEnabled && (spinBox->state & State_MouseOver);
 bool sunken = (spinBox->state & State_Sunken);
 bool upIsActive = (spinBox->activeSubControls == SC_SpinBoxUp);
 bool downIsActive = (spinBox->activeSubControls == SC_SpinBoxDown);
 bool reverse = (spinBox->direction == Qt::RightToLeft);
-//### Move this to subControlRect
+QRect editArea = option->rect;
-QRect upRect = proxy()->subControlRect(CC_SpinBox, option, SC_SpinBoxUp, widget);
-upRect.setTop(option->rect.top());
-if (reverse)
-upRect.setLeft(option->rect.left());
-else
-upRect.setRight(option->rect.right());
 QRect editRect = proxy()->subControlRect(CC_SpinBox, option, SC_SpinBoxEditField, widget);
-QRect downRect = proxy()->subControlRect(CC_SpinBox, option, SC_SpinBoxDown, widget);
+QRect upRect, downRect, buttonRect;
-downRect.setBottom(option->rect.bottom());
+if (spinBox->buttonSymbols != QAbstractSpinBox::NoButtons) {
+upRect = proxy()->subControlRect(CC_SpinBox, option, SC_SpinBoxUp, widget);
-if (reverse)
+downRect = proxy()->subControlRect(CC_SpinBox, option, SC_SpinBoxDown, widget);
-downRect.setLeft(option->rect.left());
-else
+//### Move this to subControlRect
-downRect.setRight(option->rect.right());
+upRect.setTop(option->rect.top());
-QRect buttonRect = upRect | downRect;
+if (reverse)
-QRect editArea = option->rect;
+upRect.setLeft(option->rect.left());
+else
-if (reverse)
+upRect.setRight(option->rect.right());
-editArea.setLeft(upRect.right());
-else
+downRect.setBottom(option->rect.bottom());
-editArea.setRight(upRect.left());
+if (reverse)
+downRect.setLeft(option->rect.left());
+else
+downRect.setRight(option->rect.right());
+buttonRect = upRect | downRect;
+if (reverse)
+editArea.setLeft(upRect.right());
+else
+editArea.setRight(upRect.left());
+}
 if (spinBox->frame) {
 GtkShadowType shadow = GTK_SHADOW_OUT;
 GtkStateType state = gtkPainter.gtkState(option);
 if (!(option->state & State_Enabled))
 -style->xthickness, -style->ythickness),
 option->state & State_Enabled ?
 GTK_STATE_NORMAL : GTK_STATE_INSENSITIVE, GTK_SHADOW_NONE, style, key);
 gtkPainter.paintShadow(gtkSpinButton, "entry", editArea, state, GTK_SHADOW_IN, gtkSpinButton->style, key);
-gtkPainter.paintBox(gtkSpinButton, "spinbutton", buttonRect, state, GTK_SHADOW_IN, style, key);
+if (spinBox->buttonSymbols != QAbstractSpinBox::NoButtons) {
+gtkPainter.paintBox(gtkSpinButton, "spinbutton", buttonRect, state, GTK_SHADOW_IN, style, key);
-upRect.setSize(downRect.size());
-if (!(option->state & State_Enabled))
+upRect.setSize(downRect.size());
-gtkPainter.paintBox( gtkSpinButton, "spinbutton_up", upRect, GTK_STATE_INSENSITIVE, GTK_SHADOW_IN, style, key);
+if (!(option->state & State_Enabled))
-else if (upIsActive && sunken)
+gtkPainter.paintBox( gtkSpinButton, "spinbutton_up", upRect, GTK_STATE_INSENSITIVE, GTK_SHADOW_IN, style, key);
-gtkPainter.paintBox( gtkSpinButton, "spinbutton_up", upRect, GTK_STATE_ACTIVE, GTK_SHADOW_IN, style, key);
+else if (upIsActive && sunken)
-else if (upIsActive && hover)
+gtkPainter.paintBox( gtkSpinButton, "spinbutton_up", upRect, GTK_STATE_ACTIVE, GTK_SHADOW_IN, style, key);
-gtkPainter.paintBox( gtkSpinButton, "spinbutton_up", upRect, GTK_STATE_PRELIGHT, GTK_SHADOW_OUT, style, key);
+else if (upIsActive && hover)
-else
+gtkPainter.paintBox( gtkSpinButton, "spinbutton_up", upRect, GTK_STATE_PRELIGHT, GTK_SHADOW_OUT, style, key);
-gtkPainter.paintBox( gtkSpinButton, "spinbutton_up", upRect, GTK_STATE_NORMAL, GTK_SHADOW_OUT, style, key);
+else
+gtkPainter.paintBox( gtkSpinButton, "spinbutton_up", upRect, GTK_STATE_NORMAL, GTK_SHADOW_OUT, style, key);
-if (!(option->state & State_Enabled))
-gtkPainter.paintBox( gtkSpinButton, "spinbutton_down", downRect, GTK_STATE_INSENSITIVE, GTK_SHADOW_IN, style, key);
+if (!(option->state & State_Enabled))
-else if (downIsActive && sunken)
+gtkPainter.paintBox( gtkSpinButton, "spinbutton_down", downRect, GTK_STATE_INSENSITIVE, GTK_SHADOW_IN, style, key);
-gtkPainter.paintBox( gtkSpinButton, "spinbutton_down", downRect, GTK_STATE_ACTIVE, GTK_SHADOW_IN, style, key);
+else if (downIsActive && sunken)
-else if (downIsActive && hover)
+gtkPainter.paintBox( gtkSpinButton, "spinbutton_down", downRect, GTK_STATE_ACTIVE, GTK_SHADOW_IN, style, key);
-gtkPainter.paintBox( gtkSpinButton, "spinbutton_down", downRect, GTK_STATE_PRELIGHT, GTK_SHADOW_OUT, style, key);
+else if (downIsActive && hover)
-else
+gtkPainter.paintBox( gtkSpinButton, "spinbutton_down", downRect, GTK_STATE_PRELIGHT, GTK_SHADOW_OUT, style, key);
-gtkPainter.paintBox( gtkSpinButton, "spinbutton_down", downRect, GTK_STATE_NORMAL, GTK_SHADOW_OUT, style, key);
+else
+gtkPainter.paintBox( gtkSpinButton, "spinbutton_down", downRect, GTK_STATE_NORMAL, GTK_SHADOW_OUT, style, key);
-if (option->state & State_HasFocus)
-GTK_WIDGET_UNSET_FLAGS(gtkSpinButton, GTK_HAS_FOCUS);
+if (option->state & State_HasFocus)
+GTK_WIDGET_UNSET_FLAGS(gtkSpinButton, GTK_HAS_FOCUS);
+}
 }
 if (spinBox->buttonSymbols == QAbstractSpinBox::PlusMinus) {
 int centerX = upRect.center().x();
 int centerY = upRect.center().y();
 painter->drawLine(1 + centerX - 2, 1 + centerY, 1 + centerX + 2, 1 + centerY);
 } else {
 painter->drawLine(centerX - 2, centerY, centerX + 2, centerY);
 }
-} else {
+} else if (spinBox->buttonSymbols == QAbstractSpinBox::UpDownArrows) {
 int size = d->getSpinboxArrowSize();
 int w = size / 2 - 1;
 w -= w % 2 - 1; // force odd
 int h = (w + 1)/2;
 QRect arrowRect(0, 0, w, h);
 if (const QStyleOptionMenuItem *menuItem = qstyleoption_cast<const QStyleOptionMenuItem *>(option)) {
 const int windowsItemFrame        =  2; // menu item frame width
 const int windowsItemHMargin      =  3; // menu item hor text margin
 const int windowsItemVMargin      = 26; // menu item ver text margin
 const int windowsRightBorder      = 15; // right border on windows
-GtkWidget *gtkMenu = d->gtkWidget(QLS("GtkMenu"));
 GtkWidget *gtkMenuItem = menuItem->checked ? d->gtkWidget(QLS("GtkMenu.GtkCheckMenuItem")) :
 d->gtkWidget(QLS("GtkMenu.GtkMenuItem"));
 style = gtkPainter.getStyle(gtkMenuItem);
 QColor borderColor = option->palette.background().color().darker(160);
 GtkWidget *gtkMenuSeparator = d->gtkWidget(QLS("GtkMenu.GtkSeparatorMenuItem"));
 painter->setPen(shadow.lighter(106));
 gboolean wide_separators = 0;
 gint     separator_height = 0;
 guint    horizontal_padding = 3;
+QRect separatorRect = option->rect;
 if (!d->gtk_check_version(2, 10, 0)) {
 d->gtk_widget_style_get(gtkMenuSeparator,
 "wide-separators",    &wide_separators,
 "separator-height",   &separator_height,
 "horizontal-padding", &horizontal_padding,
 NULL);
 }
+separatorRect.setHeight(option->rect.height() - 2 * gtkMenuSeparator->style->ythickness);
+separatorRect.setWidth(option->rect.width() - 2 * (horizontal_padding + gtkMenuSeparator->style->xthickness));
+separatorRect.moveCenter(option->rect.center());
 if (wide_separators)
 gtkPainter.paintBox( gtkMenuSeparator, "hseparator",
-option->rect.adjusted(0, 0, 0, -1), GTK_STATE_NORMAL, GTK_SHADOW_NONE, gtkMenu->style);
+separatorRect, GTK_STATE_NORMAL, GTK_SHADOW_NONE, gtkMenuSeparator->style);
 else
 gtkPainter.paintHline( gtkMenuSeparator, "hseparator",
-menuItem->rect, GTK_STATE_NORMAL, gtkMenu->style,
+separatorRect, GTK_STATE_NORMAL, gtkMenuSeparator->style,
-option->rect.left() + horizontal_padding, option->rect.width() - 2*horizontal_padding, 2);
+0, option->rect.right() - 1, 1);
 painter->restore();
 break;
 }
 bool selected = menuItem->state & State_Selected && menuItem->state & State_Enabled;
 if (selected) {
-QRect rect = option->rect.adjusted(0, 0, 0, -1);
+QRect rect = option->rect;
 #ifndef QT_NO_COMBOBOX
 if (qobject_cast<const QComboBox*>(widget))
 rect = option->rect;
 #endif
 gtkPainter.paintBox( gtkMenuItem, "menuitem", rect, GTK_STATE_PRELIGHT, GTK_SHADOW_OUT, style);
 ignoreCheckMark = true; // Ignore the checkmarks provided by the QComboMenuDelegate
 #endif
 if (!ignoreCheckMark) {
 // Check
-QRect checkRect(option->rect.left() + 7, option->rect.center().y() - checkSize/2, checkSize, checkSize);
+QRect checkRect(option->rect.left() + 7, option->rect.center().y() - checkSize/2 + 1, checkSize, checkSize);
 checkRect = visualRect(menuItem->direction, menuItem->rect, checkRect);
 if (checkable && menuItem->icon.isNull()) {
 // Some themes such as aero-clone draw slightly outside the paint rect
 int spacing = 1; // ### Consider using gtkCheckBox : "indicator-spacing" instead
 int x, y, w, h;
 menuitem->rect.getRect(&x, &y, &w, &h);
 int tab = menuitem->tabWidth;
 int xm = windowsItemFrame + checkcol + windowsItemHMargin;
 int xpos = menuitem->rect.x() + xm + 1;
-QRect textRect(xpos, y + windowsItemVMargin - 1, w - xm - windowsRightBorder - tab + 1, h - 2 * windowsItemVMargin);
+QRect textRect(xpos, y + windowsItemVMargin, w - xm - windowsRightBorder - tab + 1, h - 2 * windowsItemVMargin);
 QRect vTextRect = visualRect(opt->direction, menuitem->rect, textRect);
 QString s = menuitem->text;
 if (!s.isEmpty()) { // Draw text
 p->save();
 if (toolbutton->features & QStyleOptionToolButton::HasMenu)
 newSize += QSize(6, 0);
 }
 break;
 case CT_MenuItem:
 if (const QStyleOptionMenuItem *menuItem = qstyleoption_cast<const QStyleOptionMenuItem *>(option)) {
 int textMargin = 8;
 if (menuItem->menuItemType == QStyleOptionMenuItem::Separator) {
 GtkWidget *gtkMenuSeparator = d->gtkWidget(QLS("GtkMenu.GtkSeparatorMenuItem"));
-gboolean wide_separators;
+GtkRequisition sizeReq = {0, 0};
-gint     separator_height;
+d->gtk_widget_size_request(gtkMenuSeparator, &sizeReq);
-d->gtk_widget_style_get(gtkMenuSeparator,
+newSize = QSize(size.width(), sizeReq.height);
-"wide-separators",    &wide_separators,
-"separator-height",   &separator_height,
-NULL);
-newSize = QSize(size.width(), wide_separators ? separator_height - 1 : 7 );
 break;
 }
-GtkWidget *gtkMenuItem = d->gtkWidget(QLS("GtkMenu.GtkMenuItem"));
+GtkWidget *gtkMenuItem = d->gtkWidget(QLS("GtkMenu.GtkCheckMenuItem"));
 GtkStyle* style = gtkMenuItem->style;
-newSize += QSize(textMargin + style->xthickness - 1, style->ythickness - 3);
+// Note we get the perfect height for the default font since we
+// set a fake text label on the gtkMenuItem
+// But if custom fonts are used on the widget we need a minimum size
+GtkRequisition sizeReq = {0, 0};
+d->gtk_widget_size_request(gtkMenuItem, &sizeReq);
+newSize.setHeight(qMax(newSize.height() - 4, sizeReq.height));
+newSize += QSize(textMargin + style->xthickness - 1, 0);
 // Cleanlooks assumes a check column of 20 pixels so we need to
 // expand it a bit
 gint checkSize;
-d->gtk_widget_style_get(d->gtkWidget(QLS("GtkMenu.GtkCheckMenuItem")), "indicator-size", &checkSize, NULL);
+d->gtk_widget_style_get(gtkMenuItem, "indicator-size", &checkSize, NULL);
-newSize.setHeight(qMax(newSize.height(), checkSize + 2));
 newSize.setWidth(newSize.width() + qMax(0, checkSize - 20));
 }
-break;
-case CT_Menu:
-// This is evil, but QMenu adds 1 pixel too much
-newSize -= QSize(0, 1);
 break;
 case CT_SpinBox:
 // QSpinBox does some nasty things that depends on CT_LineEdit

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