diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp index b043931142b595d123d1b118e9d864e7fb80633d..33676a49063c5aa4db49093f953e125941a1fcdb 100644 --- a/src/libs/qmleditorwidgets/contextpanewidget.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp @@ -165,6 +165,20 @@ void DragWidget::protectedMoved() } +void DragWidget::leaveEvent(QEvent *) +{ +#ifdef Q_WS_MAC + unsetCursor(); +#endif +} + +void DragWidget::enterEvent(QEvent *) +{ +#ifdef Q_WS_MAC + setCursor(Qt::ArrowCursor); +#endif +} + ContextPaneWidget::ContextPaneWidget(QWidget *parent) : DragWidget(parent), m_currentWidget(0) { QGridLayout *layout = new QGridLayout(this); @@ -208,6 +222,9 @@ ContextPaneWidget::ContextPaneWidget(QWidget *parent) : DragWidget(parent), m_cu m_disableAction->setCheckable(true); connect(m_disableAction.data(), SIGNAL(toggled(bool)), this, SLOT(onDisable(bool))); m_pinned = false; +#ifdef Q_WS_MAC + setCursor(Qt::ArrowCursor); +#endif } ContextPaneWidget::~ContextPaneWidget() diff --git a/src/libs/qmleditorwidgets/contextpanewidget.h b/src/libs/qmleditorwidgets/contextpanewidget.h index d7d4d83b470775c1ce82429d566c473728517a4c..ede3e2178a40e53c3fe99b1800780103ad2fa38d 100644 --- a/src/libs/qmleditorwidgets/contextpanewidget.h +++ b/src/libs/qmleditorwidgets/contextpanewidget.h @@ -64,6 +64,8 @@ protected: void mouseReleaseEvent(QMouseEvent * event); void mouseMoveEvent(QMouseEvent * event); void virtual protectedMoved(); + void leaveEvent(QEvent *); + void enterEvent(QEvent *); private: QGraphicsDropShadowEffect *m_dropShadowEffect; diff --git a/src/libs/qmleditorwidgets/customcolordialog.cpp b/src/libs/qmleditorwidgets/customcolordialog.cpp index a698f540ef5304f2f1fc83042d91a17187a7d0e8..aea17bf9189169cfa80ed2469f9a04d3cddc55af 100644 --- a/src/libs/qmleditorwidgets/customcolordialog.cpp +++ b/src/libs/qmleditorwidgets/customcolordialog.cpp @@ -177,4 +177,19 @@ void CustomColorDialog::setupWidgets() m_blockUpdate = false; } +void CustomColorDialog::leaveEvent(QEvent *) +{ +#ifdef Q_WS_MAC + unsetCursor(); +#endif +} + +void CustomColorDialog::enterEvent(QEvent *) +{ +#ifdef Q_WS_MAC + setCursor(Qt::ArrowCursor); +#endif +} + + } //QmlEditorWidgets diff --git a/src/libs/qmleditorwidgets/customcolordialog.h b/src/libs/qmleditorwidgets/customcolordialog.h index a017280d8d60b9b85602563fdcaa3c3dc30d58e1..ea38b0da739d9434370c983b0fe2892dcdee6e92 100644 --- a/src/libs/qmleditorwidgets/customcolordialog.h +++ b/src/libs/qmleditorwidgets/customcolordialog.h @@ -89,6 +89,8 @@ signals: protected: void setupWidgets(); + void leaveEvent(QEvent *); + void enterEvent(QEvent *); private: QFrame *m_beforeColorWidget;