FCL/sf/mw/qt: comparison src/gui/styles/qmacstyle

equal deleted inserted replaced

-:41300fa6a67c
+:2f34d5167611
 /****************************************************************************
 **
-** 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.
 **
 return ret;
 }
 switch (ct) {
 case QStyle::CT_PushButton: {
-const QPushButton *psh = static_cast<const QPushButton *>(widg);
+const QPushButton *psh = qobject_cast<const QPushButton *>(widg);
-QString buttonText = qt_mac_removeMnemonics(psh->text());
+// If this comparison is false, then the widget was not a push button.
-if (buttonText.contains(QLatin1Char('\n')))
+// This is bad and there's very little we can do since we were requested to find a
-ret = QSize(-1, -1);
+// sensible size for a widget that pretends to be a QPushButton but is not.
-else if (sz == QAquaSizeLarge)
+if(psh) {
-ret = QSize(-1, qt_mac_aqua_get_metric(kThemeMetricPushButtonHeight));
+QString buttonText = qt_mac_removeMnemonics(psh->text());
-else if (sz == QAquaSizeSmall)
+if (buttonText.contains(QLatin1Char('\n')))
-ret = QSize(-1, qt_mac_aqua_get_metric(kThemeMetricSmallPushButtonHeight));
+ret = QSize(-1, -1);
-else if (sz == QAquaSizeMini)
+else if (sz == QAquaSizeLarge)
-ret = QSize(-1, qt_mac_aqua_get_metric(kThemeMetricMiniPushButtonHeight));
+ret = QSize(-1, qt_mac_aqua_get_metric(kThemeMetricPushButtonHeight));
+else if (sz == QAquaSizeSmall)
-if (!psh->icon().isNull()){
+ret = QSize(-1, qt_mac_aqua_get_metric(kThemeMetricSmallPushButtonHeight));
-// If the button got an icon, and the icon is larger than the
+else if (sz == QAquaSizeMini)
-// button, we can't decide on a default size
+ret = QSize(-1, qt_mac_aqua_get_metric(kThemeMetricMiniPushButtonHeight));
-ret.setWidth(-1);
-if (ret.height() < psh->iconSize().height())
+if (!psh->icon().isNull()){
-ret.setHeight(-1);
+// If the button got an icon, and the icon is larger than the
-}
+// button, we can't decide on a default size
-else if (buttonText == QLatin1String("OK") || buttonText == QLatin1String("Cancel")){
+ret.setWidth(-1);
-// Aqua Style guidelines restrict the size of OK and Cancel buttons to 68 pixels.
+if (ret.height() < psh->iconSize().height())
-// However, this doesn't work for German, therefore only do it for English,
+ret.setHeight(-1);
-// I suppose it would be better to do some sort of lookups for languages
+}
-// that like to have really long words.
+else if (buttonText == QLatin1String("OK") || buttonText == QLatin1String("Cancel")){
-ret.setWidth(77 - 8);
+// Aqua Style guidelines restrict the size of OK and Cancel buttons to 68 pixels.
-}
+// However, this doesn't work for German, therefore only do it for English,
+// I suppose it would be better to do some sort of lookups for languages
+// that like to have really long words.
+ret.setWidth(77 - 8);
+}
+} else {
+// The only sensible thing to do is to return whatever the style suggests...
+if (sz == QAquaSizeLarge)
+ret = QSize(-1, qt_mac_aqua_get_metric(kThemeMetricPushButtonHeight));
+else if (sz == QAquaSizeSmall)
+ret = QSize(-1, qt_mac_aqua_get_metric(kThemeMetricSmallPushButtonHeight));
+else if (sz == QAquaSizeMini)
+ret = QSize(-1, qt_mac_aqua_get_metric(kThemeMetricMiniPushButtonHeight));
+else
+// Since there's no default size we return the large size...
+ret = QSize(-1, qt_mac_aqua_get_metric(kThemeMetricPushButtonHeight));
+}
 #if 0 //Not sure we are applying the rules correctly for RadioButtons/CheckBoxes --Sam
 } else if (ct == QStyle::CT_RadioButton) {
 QRadioButton *rdo = static_cast<QRadioButton *>(widg);
 // Exception for case where multiline radio button text requires no size constrainment
 if (rdo->text().find('\n') != -1)
 break;
 case QStyle::CT_ToolButton:
 if (sz == QAquaSizeSmall) {
 int width = 0, height = 0;
 if (szHint == QSize(-1, -1)) { //just 'guess'..
-const QToolButton *bt = static_cast<const QToolButton *>(widg);
+const QToolButton *bt = qobject_cast<const QToolButton *>(widg);
-if (!bt->icon().isNull()) {
+// If this conversion fails then the widget was not what it claimed to be.
-QSize iconSize = bt->iconSize();
+if(bt) {
-QSize pmSize = bt->icon().actualSize(QSize(32, 32), QIcon::Normal);
+if (!bt->icon().isNull()) {
-width = qMax(width, qMax(iconSize.width(), pmSize.width()));
+QSize iconSize = bt->iconSize();
-height = qMax(height, qMax(iconSize.height(), pmSize.height()));
+QSize pmSize = bt->icon().actualSize(QSize(32, 32), QIcon::Normal);
-}
+width = qMax(width, qMax(iconSize.width(), pmSize.width()));
-if (!bt->text().isNull() && bt->toolButtonStyle() != Qt::ToolButtonIconOnly) {
+height = qMax(height, qMax(iconSize.height(), pmSize.height()));
-int text_width = bt->fontMetrics().width(bt->text()),
-text_height = bt->fontMetrics().height();
-if (bt->toolButtonStyle() == Qt::ToolButtonTextUnderIcon) {
-width = qMax(width, text_width);
-height += text_height;
-} else {
-width += text_width;
-width = qMax(height, text_height);
 }
+if (!bt->text().isNull() && bt->toolButtonStyle() != Qt::ToolButtonIconOnly) {
+int text_width = bt->fontMetrics().width(bt->text()),
+text_height = bt->fontMetrics().height();
+if (bt->toolButtonStyle() == Qt::ToolButtonTextUnderIcon) {
+width = qMax(width, text_width);
+height += text_height;
+} else {
+width += text_width;
+width = qMax(height, text_height);
+}
+}
+} else {
+// Let's return the size hint...
+width = szHint.width();
+height = szHint.height();
 }
 } else {
 width = szHint.width();
 height = szHint.height();
 }
 ret = QSize(width, height);
 }
 break;
 case QStyle::CT_Slider: {
 int w = -1;
-const QSlider *sld = static_cast<const QSlider *>(widg);
+const QSlider *sld = qobject_cast<const QSlider *>(widg);
-if (sz == QAquaSizeLarge) {
+// If this conversion fails then the widget was not what it claimed to be.
-if (sld->orientation() == Qt::Horizontal) {
+if(sld) {
-w = qt_mac_aqua_get_metric(kThemeMetricHSliderHeight);
+if (sz == QAquaSizeLarge) {
-if (sld->tickPosition() != QSlider::NoTicks)
+if (sld->orientation() == Qt::Horizontal) {
-w += qt_mac_aqua_get_metric(kThemeMetricHSliderTickHeight);
+w = qt_mac_aqua_get_metric(kThemeMetricHSliderHeight);
-} else {
+if (sld->tickPosition() != QSlider::NoTicks)
-w = qt_mac_aqua_get_metric(kThemeMetricVSliderWidth);
+w += qt_mac_aqua_get_metric(kThemeMetricHSliderTickHeight);
-if (sld->tickPosition() != QSlider::NoTicks)
+} else {
-w += qt_mac_aqua_get_metric(kThemeMetricVSliderTickWidth);
+w = qt_mac_aqua_get_metric(kThemeMetricVSliderWidth);
-}
+if (sld->tickPosition() != QSlider::NoTicks)
-} else if (sz == QAquaSizeSmall) {
+w += qt_mac_aqua_get_metric(kThemeMetricVSliderTickWidth);
-if (sld->orientation() == Qt::Horizontal) {
+}
-w = qt_mac_aqua_get_metric(kThemeMetricSmallHSliderHeight);
+} else if (sz == QAquaSizeSmall) {
-if (sld->tickPosition() != QSlider::NoTicks)
+if (sld->orientation() == Qt::Horizontal) {
-w += qt_mac_aqua_get_metric(kThemeMetricSmallHSliderTickHeight);
+w = qt_mac_aqua_get_metric(kThemeMetricSmallHSliderHeight);
-} else {
+if (sld->tickPosition() != QSlider::NoTicks)
-w = qt_mac_aqua_get_metric(kThemeMetricSmallVSliderWidth);
+w += qt_mac_aqua_get_metric(kThemeMetricSmallHSliderTickHeight);
-if (sld->tickPosition() != QSlider::NoTicks)
+} else {
-w += qt_mac_aqua_get_metric(kThemeMetricSmallVSliderTickWidth);
+w = qt_mac_aqua_get_metric(kThemeMetricSmallVSliderWidth);
-}
+if (sld->tickPosition() != QSlider::NoTicks)
-} else if (sz == QAquaSizeMini) {
+w += qt_mac_aqua_get_metric(kThemeMetricSmallVSliderTickWidth);
-if (sld->orientation() == Qt::Horizontal) {
+}
-w = qt_mac_aqua_get_metric(kThemeMetricMiniHSliderHeight);
+} else if (sz == QAquaSizeMini) {
-if (sld->tickPosition() != QSlider::NoTicks)
+if (sld->orientation() == Qt::Horizontal) {
-w += qt_mac_aqua_get_metric(kThemeMetricMiniHSliderTickHeight);
+w = qt_mac_aqua_get_metric(kThemeMetricMiniHSliderHeight);
-} else {
+if (sld->tickPosition() != QSlider::NoTicks)
-w = qt_mac_aqua_get_metric(kThemeMetricMiniVSliderWidth);
+w += qt_mac_aqua_get_metric(kThemeMetricMiniHSliderTickHeight);
-if (sld->tickPosition() != QSlider::NoTicks)
+} else {
-w += qt_mac_aqua_get_metric(kThemeMetricMiniVSliderTickWidth);
+w = qt_mac_aqua_get_metric(kThemeMetricMiniVSliderWidth);
-}
+if (sld->tickPosition() != QSlider::NoTicks)
+w += qt_mac_aqua_get_metric(kThemeMetricMiniVSliderTickWidth);
+}
+}
+} else {
+// This is tricky, we were requested to find a size for a slider which is not
+// a slider. We don't know if this is vertical or horizontal or if we need to
+// have tick marks or not.
+// For this case we will return an horizontal slider without tick marks.
+w = qt_mac_aqua_get_metric(kThemeMetricHSliderHeight);
+w += qt_mac_aqua_get_metric(kThemeMetricHSliderTickHeight);
 }
 if (sld->orientation() == Qt::Horizontal)
 ret.setHeight(w);
 else
 ret.setWidth(w);
 break;
 case PM_MenuHMargin:
 ret = 0;
 break;
 case PM_ToolBarFrameWidth:
-ret = 0;
+ret = 1;
+if (widget) {
+if (QMainWindow * mainWindow = qobject_cast<QMainWindow *>(widget->parent()))
+if (mainWindow->unifiedTitleAndToolBarOnMac())
+ret = 0;
+}
 break;
 default:
 ret = QWindowsStyle::pixelMetric(metric, opt, widget);
 break;
 }
 // Draw the text if it's needed.
 if (tb->toolButtonStyle != Qt::ToolButtonIconOnly) {
 needText = true;
 if (tb->toolButtonStyle == Qt::ToolButtonTextUnderIcon) {
-pr.setHeight(pixmap.size().height());
+QMainWindow *mw = qobject_cast<QMainWindow *>(w->window());
-cr.adjust(0, pr.bottom() + 1, 0, 1);
+if (mw && mw->unifiedTitleAndToolBarOnMac()) {
+pr.setHeight(pixmap.size().height());
+cr.adjust(0, pr.bottom() + 1, 0, 1);
+} else {
+pr.setHeight(pixmap.size().height() + 6);
+cr.adjust(0, pr.bottom(), 0, -3);
+}
 alignment |= Qt::AlignCenter;
 } else {
 pr.setWidth(pixmap.width() + 8);
 cr.adjust(pr.right(), 0, 0, 0);
 alignment |= Qt::AlignLeft | Qt::AlignVCenter;
 rotateTabPainter(p, myTab.shape, myTab.rect);
 QPalette np = tab->palette;
 np.setColor(QPalette::WindowText, QColor(255, 255, 255, 75));
 QRect nr = subElementRect(SE_TabBarTabText, opt, w);
-nr.moveTop(+1);
+nr.moveTop(-1);
 int alignment = Qt::AlignCenter | Qt::TextShowMnemonic | Qt::TextHideMnemonic;
 proxy()->drawItemText(p, nr, alignment, np, tab->state & State_Enabled,
 tab->text, QPalette::WindowText);
 p->restore();
 }
 // myFont may not have any "hard" flags set. We override
 // the point size so that when it is resolved against the device, this font will win.
 // This is mainly to handle cases where someone sets the font on the window
 // and then the combo inherits it and passes it onward. At that point the resolve mask
 // is very, very weak. This makes it stonger.
-myFont.setPointSizeF(mi->font.pointSizeF());
+myFont.setPointSizeF(QFontInfo(mi->font).pointSizeF());
 p->setFont(myFont);
 p->drawText(xpos, yPos, contentRect.width() - xm - tabwidth + 1,
 contentRect.height(), text_flags ^ Qt::AlignRight, s);
 p->restore();
 }
 // We need to allow the text a bit more space when the header is as
 // small as kThemeMetricListHeaderHeight, otherwise it gets clipped:
 rect.setY(0);
 rect.setHeight(widget->height());
 }
-if (opt->direction == Qt::RightToLeft)
-rect.adjust(15, 0, -20, 0);
 }
 break;
 case SE_ProgressBarGroove:
 case SE_ProgressBarLabel:
 break;
 sz = QSize(w, h);
 }
 break;
 case CT_ToolButton:
 if (widget && qobject_cast<const QToolBar *>(widget->parentWidget())) {
-sz.rwidth() += 4;
+if (QMainWindow * mainWindow = qobject_cast<QMainWindow *>(widget->parent())) {
-if (sz.height() <= 32) {
+if (mainWindow->unifiedTitleAndToolBarOnMac()) {
-// Workaround strange HIToolBar bug when getting constraints.
+sz.rwidth() += 4;
-sz.rheight() += 1;
+if (sz.height() <= 32) {
-}
+// Workaround strange HIToolBar bug when getting constraints.
-return sz;
+sz.rheight() += 1;
+}
+return sz;
+}
+}
 }
 sz.rwidth() += 10;
 sz.rheight() += 10;
 return sz;
 case CT_ComboBox:

changeset 18	2f34d5167611
parent 3	41300fa6a67c
child 30	5dc02b23752f