Skip to content

Hide cross-hair cursor when lifting pen if preview circle on #726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GavinSmith0123 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Hide cross-hair cursor when lifting pen if preview circle on #726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/board/UBBoardView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,13 @@ void UBBoardView::tabletEvent (QTabletEvent * event)
scene ()->setToolCursor (currentTool);
setToolCursor (currentTool);

if (currentTool == UBStylusTool::Marker) {
scene()->drawMarkerCircle(scenePos);
}
else if (currentTool == UBStylusTool::Pen) {
scene()->drawPenCircle(scenePos);
}

scene ()->inputDeviceRelease ();

mPendingStylusReleaseEvent = false;
Expand Down Expand Up @@ -1329,6 +1336,15 @@ void UBBoardView::mouseReleaseEvent (QMouseEvent *event)
UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController ()->stylusTool ();

setToolCursor (currentTool);

QPointF scenePos = mapToScene(event->pos());
if (currentTool == UBStylusTool::Marker) {
scene()->drawMarkerCircle(scenePos);
}
else if (currentTool == UBStylusTool::Pen) {
scene()->drawPenCircle(scenePos);
}

// first/ propagate device release to the scene
if (scene())
scene()->inputDeviceRelease();
Expand Down
4 changes: 2 additions & 2 deletions src/domain/UBGraphicsScene.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,8 @@ public slots:
void textUndoCommandAdded(UBGraphicsTextItem *textItem);

void setToolCursor(int tool);
void drawMarkerCircle(const QPointF& pEndPoint);
void drawPenCircle(const QPointF& pEndPoint);

void selectionChangedProcessing();
void moveMagnifier();
Expand Down Expand Up @@ -407,8 +409,6 @@ public slots:
void redrawEraser(bool pressed);
void hideEraser();
void drawPointer(const QPointF& pEndPoint, bool isFirstDraw = false);
void drawMarkerCircle(const QPointF& pEndPoint);
void drawPenCircle(const QPointF& pEndPoint);
void hideMarkerCircle();
void hidePenCircle();
void DisposeMagnifierQWidgets();
Expand Down