Skip to content

fix: detect delegate handle with tablet pen #1288

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

Merged
kaamui merged 1 commit into from
Jun 24, 2025
Merged

fix: detect delegate handle with tablet pen #1288

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
14 changes: 7 additions & 7 deletions src/domain/UBGraphicsDelegateFrame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ void UBGraphicsDelegateFrame::mousePressEvent(QGraphicsSceneMouseEvent *event)

mOriginalSize = delegated()->boundingRect().size();

mCurrentTool = toolFromPos(event->pos());
mCurrentTool = toolFromPos(event->scenePos());

if (mCurrentTool == Rotate)
{
Expand Down Expand Up @@ -1041,37 +1041,37 @@ UBGraphicsDelegateFrame::FrameTool UBGraphicsDelegateFrame::toolFromPos(QPointF
if(mDelegate->isLocked())
return None;
// check handles in reverse order of creation to account for z order
else if (mRotateButton && mRotateButton->isUnderMouse() && mDelegate && mDelegate->testUBFlags(GF_REVOLVABLE))
else if (mRotateButton && mRotateButton->contains(mRotateButton->mapFromScene(pos)) && mDelegate && mDelegate->testUBFlags(GF_REVOLVABLE))
return Rotate;
else if (mTopResizeGrip && mTopResizeGrip->isUnderMouse() && ResizingHorizontally != mOperationMode && mDelegate->testUBFlags(GF_SCALABLE_Y_AXIS)){
else if (mTopResizeGrip && mTopResizeGrip->contains(mTopResizeGrip->mapFromScene(pos)) && ResizingHorizontally != mOperationMode && mDelegate->testUBFlags(GF_SCALABLE_Y_AXIS)){
if(mMirrorY){
return ResizeBottom;
}else{
return ResizeTop;
}
}
else if (mRightResizeGrip && mRightResizeGrip->isUnderMouse() && mDelegate->testUBFlags(GF_SCALABLE_X_AXIS)){
else if (mRightResizeGrip && mRightResizeGrip->contains(mRightResizeGrip->mapFromScene(pos)) && mDelegate->testUBFlags(GF_SCALABLE_X_AXIS)){
if(mMirrorX){
return ResizeLeft;
}else{
return ResizeRight;
}
}
else if (mLeftResizeGrip && mLeftResizeGrip->isUnderMouse() && mDelegate->testUBFlags(GF_SCALABLE_X_AXIS)){
else if (mLeftResizeGrip && mLeftResizeGrip->contains(mLeftResizeGrip->mapFromScene(pos)) && mDelegate->testUBFlags(GF_SCALABLE_X_AXIS)){
if(mMirrorX){
return ResizeRight;
}else{
return ResizeLeft;
}
}
else if (mBottomResizeGrip && mBottomResizeGrip->isUnderMouse() && ResizingHorizontally != mOperationMode && mDelegate->testUBFlags(GF_SCALABLE_Y_AXIS)){
else if (mBottomResizeGrip && mBottomResizeGrip->contains(mBottomResizeGrip->mapFromScene(pos)) && ResizingHorizontally != mOperationMode && mDelegate->testUBFlags(GF_SCALABLE_Y_AXIS)){
if(mMirrorY){
return ResizeTop;
}else{
return ResizeBottom;
}
}
else if (mBottomRightResizeGrip && mBottomRightResizeGrip->isUnderMouse() && ResizingHorizontally != mOperationMode && mDelegate->testUBFlags(GF_SCALABLE_X_AXIS) && mDelegate->testUBFlags(GF_SCALABLE_Y_AXIS))
else if (mBottomRightResizeGrip && mBottomRightResizeGrip->contains(mBottomRightResizeGrip->mapFromScene(pos)) && ResizingHorizontally != mOperationMode && mDelegate->testUBFlags(GF_SCALABLE_X_AXIS) && mDelegate->testUBFlags(GF_SCALABLE_Y_AXIS))
return ResizeBottomRight;
else
return Move;
Expand Down