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

equal deleted inserted replaced

-:5dc02b23752f
+:3e2da88830cd
 #include <qdatetimeedit.h>
 #include <qmath.h>
 #include <QtGui/qgraphicsproxywidget.h>
 #include <QtGui/qgraphicsview.h>
 #include <private/qt_cocoa_helpers_mac_p.h>
+#include "qmacstyle_mac_p.h"
 #include <private/qstylehelper_p.h>
 QT_BEGIN_NAMESPACE
-extern QRegion qt_mac_convert_mac_region(RgnHandle); //qregion_mac.cpp
 // The following constants are used for adjusting the size
 // of push buttons so that they are drawn inside their bounds.
-static const int PushButtonLeftOffset = 6;
+const int QMacStylePrivate::PushButtonLeftOffset = 6;
-static const int PushButtonTopOffset = 4;
+const int QMacStylePrivate::PushButtonTopOffset = 4;
-static const int PushButtonRightOffset = 12;
+const int QMacStylePrivate::PushButtonRightOffset = 12;
-static const int PushButtonBottomOffset = 12;
+const int QMacStylePrivate::PushButtonBottomOffset = 12;
-static const int MiniButtonH = 26;
+const int QMacStylePrivate::MiniButtonH = 26;
-static const int SmallButtonH = 30;
+const int QMacStylePrivate::SmallButtonH = 30;
-static const int BevelButtonW = 50;
+const int QMacStylePrivate::BevelButtonW = 50;
-static const int BevelButtonH = 22;
+const int QMacStylePrivate::BevelButtonH = 22;
-static const int PushButtonContentPadding = 6;
+const int QMacStylePrivate::PushButtonContentPadding = 6;
 // These colors specify the titlebar gradient colors on
 // Leopard. Ideally we should get them from the system.
 static const QColor titlebarGradientActiveBegin(220, 220, 220);
 static const QColor titlebarGradientActiveEnd(151, 151, 151);
 // Gradient colors used for the dock widget title bar and
 // non-unifed tool bar bacground.
 static const QColor mainWindowGradientBegin(240, 240, 240);
 static const QColor mainWindowGradientEnd(200, 200, 200);
-#if (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5)
+static const int DisclosureOffset = 4;
-enum {
-kThemePushButtonTextured = 31,
-kThemePushButtonTexturedSmall = 32,
-kThemePushButtonTexturedMini = 33
-};
-/* Search fields */
-enum {
-kHIThemeFrameTextFieldRound = 1000,
-kHIThemeFrameTextFieldRoundSmall = 1001,
-kHIThemeFrameTextFieldRoundMini = 1002
-};
-#endif
 // Resolve these at run-time, since the functions was moved in Leopard.
 typedef HIRect * (*PtrHIShapeGetBounds)(HIShapeRef, HIRect *);
 static PtrHIShapeGetBounds ptrHIShapeGetBounds = 0;
+static int closeButtonSize = 12;
+extern QRegion qt_mac_convert_mac_region(RgnHandle); //qregion_mac.cpp
 static bool isVerticalTabs(const QTabBar::Shape shape) {
 return (shape == QTabBar::RoundedEast
 || shape == QTabBar::TriangularEast
 || shape == QTabBar::RoundedWest
 || shape == QTabBar::TriangularWest);
 }
-static int closeButtonSize = 12;
 void drawTabCloseButton(QPainter *p, bool hover, bool active, bool selected)
 {
 // draw background circle
 p->setRenderHints(QPainter::Antialiasing);
 p->drawLine(tabRect.x(), height - 2, width, height - 2);
 p->setPen(borderBottom);
 p->drawLine(tabRect.x(), height - 1, width, height - 1);
 }
-/*
-AHIG:
-Apple Human Interface Guidelines
-http://developer.apple.com/documentation/UserExperience/Conceptual/OSXHIGuidelines/
-Builder:
-Apple Interface Builder v. 3.1.1
-*/
-// this works as long as we have at most 16 different control types
-#define CT1(c) CT2(c, c)
-#define CT2(c1, c2) ((uint(c1) << 16) | uint(c2))
-enum QAquaWidgetSize { QAquaSizeLarge = 0, QAquaSizeSmall = 1, QAquaSizeMini = 2,
-QAquaSizeUnknown = -1 };
-#define SIZE(large, small, mini) \
-(controlSize == QAquaSizeLarge ? (large) : controlSize == QAquaSizeSmall ? (small) : (mini))
-// same as return SIZE(...) but optimized
-#define return_SIZE(large, small, mini) \
-do { \
-static const int sizes[] = { (large), (small), (mini) }; \
-return sizes[controlSize]; \
-} while (0)
 static int getControlSize(const QStyleOption *option, const QWidget *widget)
 {
 if (option) {
 if (option->state & (QStyle::State_Small | QStyle::State_Mini))
 return (option->state & QStyle::State_Mini) ? QAquaSizeMini : QAquaSizeSmall;
 break;
 }
 return ttd;
 }
-class QMacStylePrivate : public QObject
-{
-Q_OBJECT
-public:
-QMacStylePrivate(QMacStyle *style);
-// Stuff from QAquaAnimate:
-bool addWidget(QWidget *);
-void removeWidget(QWidget *);
-enum Animates { AquaPushButton, AquaProgressBar, AquaListViewItemOpen };
-bool animatable(Animates, const QWidget *) const;
-void stopAnimate(Animates, QWidget *);
-void startAnimate(Animates, QWidget *);
-static ThemeDrawState getDrawState(QStyle::State flags);
-QAquaWidgetSize aquaSizeConstrain(const QStyleOption *option, const QWidget *widg,
-QStyle::ContentsType ct = QStyle::CT_CustomBase,
-QSize szHint=QSize(-1, -1), QSize *insz = 0) const;
-void getSliderInfo(QStyle::ComplexControl cc, const QStyleOptionSlider *slider,
-HIThemeTrackDrawInfo *tdi, const QWidget *needToRemoveMe);
-bool doAnimate(Animates);
-inline int animateSpeed(Animates) const { return 33; }
-// Utility functions
-void drawColorlessButton(const HIRect &macRect, HIThemeButtonDrawInfo *bdi,
-QPainter *p, const QStyleOption *opt) const;
-QSize pushButtonSizeFromContents(const QStyleOptionButton *btn) const;
-HIRect pushButtonContentBounds(const QStyleOptionButton *btn,
-const HIThemeButtonDrawInfo *bdi) const;
-void initComboboxBdi(const QStyleOptionComboBox *combo, HIThemeButtonDrawInfo *bdi,
-const QWidget *widget, const ThemeDrawState &tds);
-static HIRect comboboxInnerBounds(const HIRect &outerBounds, int buttonKind);
-static QRect comboboxEditBounds(const QRect &outerBounds, const HIThemeButtonDrawInfo &bdi);
-static void drawCombobox(const HIRect &outerBounds, const HIThemeButtonDrawInfo &bdi, QPainter *p);
-static void drawTableHeader(const HIRect &outerBounds, bool drawTopBorder, bool drawLeftBorder,
-const HIThemeButtonDrawInfo &bdi, QPainter *p);
-bool contentFitsInPushButton(const QStyleOptionButton *btn, HIThemeButtonDrawInfo *bdi,
-ThemeButtonKind buttonKindToCheck) const;
-void initHIThemePushButton(const QStyleOptionButton *btn, const QWidget *widget,
-const ThemeDrawState tds,
-HIThemeButtonDrawInfo *bdi) const;
-QPixmap generateBackgroundPattern() const;
-protected:
-bool eventFilter(QObject *, QEvent *);
-void timerEvent(QTimerEvent *);
-private slots:
-void startAnimationTimer();
-public:
-QPointer<QPushButton> defaultButton; //default push buttons
-int timerID;
-QList<QPointer<QWidget> > progressBars; //existing progress bars that need animation
-struct ButtonState {
-int frame;
-enum { ButtonDark, ButtonLight } dir;
-} buttonState;
-UInt8 progressFrame;
-QPointer<QFocusFrame> focusWidget;
-CFAbsoluteTime defaultButtonStart;
-QMacStyle *q;
-bool mouseDown;
-};
 QT_BEGIN_INCLUDE_NAMESPACE
-#include "qmacstyle_mac.moc"
+#include "moc_qmacstyle_mac.cpp"
+#include "moc_qmacstyle_mac_p.cpp"
 QT_END_INCLUDE_NAMESPACE
 /*****************************************************************************
 External functions
 *****************************************************************************/
 {
 HIRect outerBounds = qt_hirectForQRect(btn->rect);
 // Adjust the bounds to correct for
 // carbon not calculating the content bounds fully correct
 if (bdi->kind == kThemePushButton || bdi->kind == kThemePushButtonSmall){
-outerBounds.origin.y += PushButtonTopOffset;
+outerBounds.origin.y += QMacStylePrivate::PushButtonTopOffset;
-outerBounds.size.height -= PushButtonBottomOffset;
+outerBounds.size.height -= QMacStylePrivate::PushButtonBottomOffset;
 } else if (bdi->kind == kThemePushButtonMini) {
-outerBounds.origin.y += PushButtonTopOffset;
+outerBounds.origin.y += QMacStylePrivate::PushButtonTopOffset;
 }
 HIRect contentBounds;
 HIThemeGetButtonContentBounds(&outerBounds, bdi, &contentBounds);
 return contentBounds;
 */
 QSize QMacStylePrivate::pushButtonSizeFromContents(const QStyleOptionButton *btn) const
 {
 QSize csz(0, 0);
 QSize iconSize = btn->icon.isNull() ? QSize(0, 0)
-: (btn->iconSize + QSize(PushButtonContentPadding, 0));
+: (btn->iconSize + QSize(QMacStylePrivate::PushButtonContentPadding, 0));
 QRect textRect = btn->text.isEmpty() ? QRect(0, 0, 1, 1)
 : btn->fontMetrics.boundingRect(QRect(), Qt::AlignCenter, btn->text);
 csz.setWidth(iconSize.width() + textRect.width()
 + ((btn->features & QStyleOptionButton::HasMenu)
 ? q->proxy()->pixelMetric(QStyle::PM_MenuButtonIndicator, btn, 0) : 0));
 // to get the dynamic choosing of button kind.
 case QAquaSizeUnknown:
 // Choose the button kind that closest match the button rect, but at the
 // same time displays the button contents without clipping.
 bdi->kind = kThemeBevelButton;
-if (btn->rect.width() >= BevelButtonW && btn->rect.height() >= BevelButtonH){
+if (btn->rect.width() >= QMacStylePrivate::BevelButtonW && btn->rect.height() >= QMacStylePrivate::BevelButtonH){
 if (widget && widget->testAttribute(Qt::WA_MacVariableSize)) {
-if (btn->rect.height() <= MiniButtonH){
+if (btn->rect.height() <= QMacStylePrivate::MiniButtonH){
 if (contentFitsInPushButton(btn, bdi, kThemePushButtonMini))
 bdi->kind = kThemePushButtonMini;
-} else if (btn->rect.height() <= SmallButtonH){
+} else if (btn->rect.height() <= QMacStylePrivate::SmallButtonH){
 if (contentFitsInPushButton(btn, bdi, kThemePushButtonSmall))
 bdi->kind = kThemePushButtonSmall;
 } else if (contentFitsInPushButton(btn, bdi, kThemePushButton)) {
 bdi->kind = kThemePushButton;
 }
 if (!usePainter && qt_mac_backgroundPattern
 && qt_mac_backgroundPattern->cacheKey() == brush.texture().cacheKey()) {
 painter->setClipRegion(rgn);
-CGContextRef cg = qt_mac_cg_context(target);
+QCFType<CGContextRef> cg = qt_mac_cg_context(target);
 CGContextSaveGState(cg);
 HIThemeSetFill(kThemeBrushDialogBackgroundActive, 0, cg, kHIThemeOrientationInverted);
 const QVector<QRect> &rects = rgn.rects();
 for (int i = 0; i < rects.size(); ++i) {
 if (opt->state & State_Open)
 bi.value = kThemeDisclosureDown;
 else
 bi.value = opt->direction == Qt::LeftToRight ? kThemeDisclosureRight : kThemeDisclosureLeft;
 bi.adornment = kThemeAdornmentNone;
-HIRect hirect = qt_hirectForQRect(opt->rect);
+HIRect hirect = qt_hirectForQRect(opt->rect.adjusted(DisclosureOffset,0,-DisclosureOffset,0));
 HIThemeDrawButton(&hirect, &bi, cg, kHIThemeOrientationNormal, 0);
 break; }
 case PE_Frame: {
 QPen oldPen = p->pen();
 // Unlike Carbon, we want the button to always be drawn inside its bounds.
 // Therefore, make the button a bit smaller, so that even if it got focus,
 // the focus 'shadow' will be inside.
 HIRect newRect = qt_hirectForQRect(btn->rect);
 if (bdi.kind == kThemePushButton || bdi.kind == kThemePushButtonSmall) {
-newRect.origin.x += PushButtonLeftOffset;
+newRect.origin.x += QMacStylePrivate::PushButtonLeftOffset;
-newRect.origin.y += PushButtonTopOffset;
+newRect.origin.y += QMacStylePrivate::PushButtonTopOffset;
-newRect.size.width -= PushButtonRightOffset;
+newRect.size.width -= QMacStylePrivate::PushButtonRightOffset;
-newRect.size.height -= PushButtonBottomOffset;
+newRect.size.height -= QMacStylePrivate::PushButtonBottomOffset;
 } else if (bdi.kind == kThemePushButtonMini) {
-newRect.origin.x += PushButtonLeftOffset - 2;
+newRect.origin.x += QMacStylePrivate::PushButtonLeftOffset - 2;
-newRect.origin.y += PushButtonTopOffset;
+newRect.origin.y += QMacStylePrivate::PushButtonTopOffset;
-newRect.size.width -= PushButtonRightOffset - 4;
+newRect.size.width -= QMacStylePrivate::PushButtonRightOffset - 4;
 }
 HIThemeDrawButton(&newRect, &bdi, cg, kHIThemeOrientationNormal, 0);
 if (btn->features & QStyleOptionButton::HasMenu) {
 int mbi = proxy()->pixelMetric(QStyle::PM_MenuButtonIndicator, btn, w);
 QRect ir = btn->rect;
-HIRect arrowRect = CGRectMake(ir.right() - mbi - PushButtonRightOffset,
+HIRect arrowRect = CGRectMake(ir.right() - mbi - QMacStylePrivate::PushButtonRightOffset,
 ir.height() / 2 - 4, mbi, ir.height() / 2);
 bool drawColorless = btn->palette.currentColorGroup() == QPalette::Active;
 if (drawColorless && tds == kThemeStateInactive)
 tds = kThemeStateActive;
 // Decide if the icon is should be on or off:
 QIcon::State state = QIcon::Off;
 if (btn->state & State_On)
 state = QIcon::On;
 QPixmap pixmap = btn->icon.pixmap(btn->iconSize, mode, state);
-contentW += pixmap.width() + PushButtonContentPadding;
+contentW += pixmap.width() + QMacStylePrivate::PushButtonContentPadding;
 int iconLeftOffset = freeContentRect.x() + (freeContentRect.width() - contentW) / 2;
 int iconTopOffset = freeContentRect.y() + (freeContentRect.height() - pixmap.height()) / 2;
 QRect iconDestRect(iconLeftOffset, iconTopOffset, pixmap.width(), pixmap.height());
 QRect visualIconDestRect = visualRect(btn->direction, freeContentRect, iconDestRect);
 proxy()->drawItemPixmap(p, visualIconDestRect, Qt::AlignLeft | Qt::AlignVCenter, pixmap);
 int newOffset = iconDestRect.x() + iconDestRect.width()
-+ PushButtonContentPadding - textRect.x();
++ QMacStylePrivate::PushButtonContentPadding - textRect.x();
 textRect.adjust(newOffset, 0, newOffset, 0);
 }
 // Draw the text:
 if (hasText) {
 textRect = visualRect(btn->direction, freeContentRect, textRect);
 {
 QRect rect;
 int controlSize = getControlSize(opt, widget);
 switch (sr) {
+case SE_ItemViewItemText:
+if (const QStyleOptionViewItemV4 *vopt = qstyleoption_cast<const QStyleOptionViewItemV4 *>(opt)) {
+int fw = proxy()->pixelMetric(PM_FocusFrameHMargin, opt, widget);
+// We add the focusframeargin between icon and text in commonstyle
+rect = QCommonStyle::subElementRect(sr, opt, widget);
+if (vopt->features & QStyleOptionViewItemV2::HasDecoration)
+rect.adjust(-fw, 0, 0, 0);
+}
+break;
 case SE_ToolBoxTabContents:
 rect = QCommonStyle::subElementRect(sr, opt, widget);
 break;
 case SE_PushButtonContents:
 if (const QStyleOptionButton *btn = qstyleoption_cast<const QStyleOptionButton *>(opt)) {
 }
 break;
 case SE_HeaderLabel:
 if (qstyleoption_cast<const QStyleOptionHeader *>(opt)) {
 rect = QWindowsStyle::subElementRect(sr, opt, widget);
-if (widget && widget->height() <= qt_mac_aqua_get_metric(kThemeMetricListHeaderHeight)){
+if (widget && widget->height() <= 22){
-// We need to allow the text a bit more space when the header is as
+// We need to allow the text a bit more space when the header is
-// small as kThemeMetricListHeaderHeight, otherwise it gets clipped:
+// small, otherwise it gets clipped:
 rect.setY(0);
 rect.setHeight(widget->height());
 }
 }
 break;
 HIThemeGetButtonContentBounds(&inRect, &bdi, &contentRect);
 QCFType<HIShapeRef> shape;
 HIRect outRect;
 HIThemeGetButtonShape(&inRect, &bdi, &shape);
 ptrHIShapeGetBounds(shape, &outRect);
-rect = QRect(int(outRect.origin.x), int(outRect.origin.y),
+rect = QRect(int(outRect.origin.x + DisclosureOffset), int(outRect.origin.y),
-int(contentRect.origin.x - outRect.origin.x), int(outRect.size.height));
+int(contentRect.origin.x - outRect.origin.x + DisclosureOffset),
+int(outRect.size.height));
 break;
 }
 case SE_TabWidgetLeftCorner:
 if (const QStyleOptionTabWidgetFrame *twf
 = qstyleoption_cast<const QStyleOptionTabWidgetFrame *>(opt)) {
 break;
 case QStyle::CT_PushButton:
 // By default, we fit the contents inside a normal rounded push button.
 // Do this by add enough space around the contents so that rounded
 // borders (including highlighting when active) will show.
-sz.rwidth() += PushButtonLeftOffset + PushButtonRightOffset + 12;
+sz.rwidth() += QMacStylePrivate::PushButtonLeftOffset + QMacStylePrivate::PushButtonRightOffset + 12;
-sz.rheight() += PushButtonTopOffset + PushButtonBottomOffset;
+sz.rheight() += QMacStylePrivate::PushButtonTopOffset + QMacStylePrivate::PushButtonBottomOffset;
 break;
 case QStyle::CT_MenuItem:
 if (const QStyleOptionMenuItem *mi = qstyleoption_cast<const QStyleOptionMenuItem *>(opt)) {
 int maxpmw = mi->maxIconWidth;
 const QComboBox *comboBox = qobject_cast<const QComboBox *>(widget);
 sz = sz.expandedTo(QSize(minimumSize, sz.height()));
 else
 sz = sz.expandedTo(QSize(sz.width(), minimumSize));
 }
 break;
+case CT_ItemViewItem:
+if (const QStyleOptionViewItemV4 *vopt = qstyleoption_cast<const QStyleOptionViewItemV4 *>(opt)) {
+sz = QCommonStyle::sizeFromContents(ct, vopt, csz, widget);
+sz.setHeight(sz.height() + 2);
+}
+break;
 default:
 sz = QWindowsStyle::sizeFromContents(ct, opt, csz, widget);
 }
 if (useAquaGuideline){

changeset 33	3e2da88830cd
parent 30	5dc02b23752f
child 37	758a864f9613