From 1b5df7c727d3caca8e4a0c9285a3a581c2ac076b Mon Sep 17 00:00:00 2001 From: Franck Jullien Date: Fri, 24 May 2019 07:06:06 +0200 Subject: [PATCH] [TD] Fix cursor behavior --- src/Mod/TechDraw/Gui/QGVPage.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Mod/TechDraw/Gui/QGVPage.cpp b/src/Mod/TechDraw/Gui/QGVPage.cpp index 352ba3e315..d55ab3190d 100644 --- a/src/Mod/TechDraw/Gui/QGVPage.cpp +++ b/src/Mod/TechDraw/Gui/QGVPage.cpp @@ -168,7 +168,7 @@ void QGVPage::cancelBalloonPlacing(void) { getDrawPage()->balloonPlacing = false; balloonCursor->hide(); - QApplication::setOverrideCursor(Qt::ArrowCursor); + QApplication::restoreOverrideCursor(); } void QGVPage::drawBackground(QPainter *p, const QRectF &) @@ -951,7 +951,6 @@ void QGVPage::enterEvent(QEvent *event) balloonCursor->hide(); QApplication::setOverrideCursor(QCursor(QPixmap(QString::fromUtf8(":/icons/cursor-balloon.png")),0,32)); } else { - setCursor(Qt::ArrowCursor); QApplication::restoreOverrideCursor(); viewport()->setCursor(Qt::ArrowCursor); } @@ -959,7 +958,7 @@ void QGVPage::enterEvent(QEvent *event) void QGVPage::leaveEvent(QEvent * event) { - QApplication::setOverrideCursor(Qt::ArrowCursor); + QApplication::restoreOverrideCursor(); if(getDrawPage()->balloonPlacing) { @@ -990,7 +989,6 @@ void QGVPage::leaveEvent(QEvent * event) void QGVPage::mousePressEvent(QMouseEvent *event) { QGraphicsView::mousePressEvent(event); -// setCursor(Qt::ArrowCursor); } void QGVPage::mouseMoveEvent(QMouseEvent *event) @@ -1002,7 +1000,7 @@ void QGVPage::mouseMoveEvent(QMouseEvent *event) void QGVPage::mouseReleaseEvent(QMouseEvent *event) { if(getDrawPage()->balloonPlacing) { - QApplication::setOverrideCursor(Qt::ArrowCursor); + QApplication::restoreOverrideCursor(); balloonCursor->hide(); std::string FeatName = getDrawPage()->getDocument()->getUniqueObjectName("Balloon"); @@ -1031,6 +1029,7 @@ void QGVPage::mouseReleaseEvent(QMouseEvent *event) } QGraphicsView::mouseReleaseEvent(event); + viewport()->setCursor(Qt::ArrowCursor); } TechDraw::DrawPage* QGVPage::getDrawPage()