equal
deleted
inserted
replaced
685 |
685 |
686 #ifdef Q_WS_MAC |
686 #ifdef Q_WS_MAC |
687 /*! \reimp */ |
687 /*! \reimp */ |
688 bool QPushButton::hitButton(const QPoint &pos) const |
688 bool QPushButton::hitButton(const QPoint &pos) const |
689 { |
689 { |
690 // This is only required if we are using the native style, so check that first. |
690 QStyleOptionButton opt; |
691 QMacStyle *macStyle = qobject_cast<QMacStyle *>(style()); |
691 initStyleOption(&opt); |
692 // If this is a flat button we just bail out. |
692 if (qt_mac_buttonIsRenderedFlat(this, &opt)) |
693 if(isFlat() || (0 == macStyle)) |
|
694 return QAbstractButton::hitButton(pos); |
693 return QAbstractButton::hitButton(pos); |
|
694 |
695 // Now that we know we are using the native style, let's proceed. |
695 // Now that we know we are using the native style, let's proceed. |
696 Q_D(const QPushButton); |
696 Q_D(const QPushButton); |
697 QPushButtonPrivate *nonConst = const_cast<QPushButtonPrivate *>(d); |
697 QPushButtonPrivate *nonConst = const_cast<QPushButtonPrivate *>(d); |
698 // In OSX buttons are round, which causes the hit method to be special. |
698 // In OSX buttons are round, which causes the hit method to be special. |
699 // We cannot simply relay on detecting if something is inside the rect or not, |
699 // We cannot simply relay on detecting if something is inside the rect or not, |