forked from qt-creator/qt-creator
QuickToolBars: fix cursor on Mac OS X
We have to set the cursor on Mac OS X manually in enter and leave events. Task-number: QTCREATORBUG-2622 Reviewed-by: Kai Koehne
This commit is contained in:
@@ -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)
|
ContextPaneWidget::ContextPaneWidget(QWidget *parent) : DragWidget(parent), m_currentWidget(0)
|
||||||
{
|
{
|
||||||
QGridLayout *layout = new QGridLayout(this);
|
QGridLayout *layout = new QGridLayout(this);
|
||||||
@@ -208,6 +222,9 @@ ContextPaneWidget::ContextPaneWidget(QWidget *parent) : DragWidget(parent), m_cu
|
|||||||
m_disableAction->setCheckable(true);
|
m_disableAction->setCheckable(true);
|
||||||
connect(m_disableAction.data(), SIGNAL(toggled(bool)), this, SLOT(onDisable(bool)));
|
connect(m_disableAction.data(), SIGNAL(toggled(bool)), this, SLOT(onDisable(bool)));
|
||||||
m_pinned = false;
|
m_pinned = false;
|
||||||
|
#ifdef Q_WS_MAC
|
||||||
|
setCursor(Qt::ArrowCursor);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
ContextPaneWidget::~ContextPaneWidget()
|
ContextPaneWidget::~ContextPaneWidget()
|
||||||
|
|||||||
@@ -64,6 +64,8 @@ protected:
|
|||||||
void mouseReleaseEvent(QMouseEvent * event);
|
void mouseReleaseEvent(QMouseEvent * event);
|
||||||
void mouseMoveEvent(QMouseEvent * event);
|
void mouseMoveEvent(QMouseEvent * event);
|
||||||
void virtual protectedMoved();
|
void virtual protectedMoved();
|
||||||
|
void leaveEvent(QEvent *);
|
||||||
|
void enterEvent(QEvent *);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QGraphicsDropShadowEffect *m_dropShadowEffect;
|
QGraphicsDropShadowEffect *m_dropShadowEffect;
|
||||||
|
|||||||
@@ -177,4 +177,19 @@ void CustomColorDialog::setupWidgets()
|
|||||||
m_blockUpdate = false;
|
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
|
} //QmlEditorWidgets
|
||||||
|
|||||||
@@ -89,6 +89,8 @@ signals:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
void setupWidgets();
|
void setupWidgets();
|
||||||
|
void leaveEvent(QEvent *);
|
||||||
|
void enterEvent(QEvent *);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QFrame *m_beforeColorWidget;
|
QFrame *m_beforeColorWidget;
|
||||||
|
|||||||
Reference in New Issue
Block a user