diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index cac36774..e9ffde4d 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -289,16 +289,9 @@ void UBBoardView::tabletEvent (QTabletEvent * event) return; } - qDebug() << "tableEvent position " << event->pos(); - qDebug() << "tableEvent global position " << event->globalPos(); - - UBDrawingController *dc = UBDrawingController::drawingController (); QPointF tabletPos = event->pos(); - qDebug() << "tabletPos " << tabletPos; - - UBStylusTool::Enum currentTool = (UBStylusTool::Enum)dc->stylusTool (); if (event->type () == QEvent::TabletPress || event->type () == QEvent::TabletEnterProximity) { diff --git a/src/domain/UBGraphicsDelegateFrame.cpp b/src/domain/UBGraphicsDelegateFrame.cpp index 0614bd37..7dd2e5ab 100644 --- a/src/domain/UBGraphicsDelegateFrame.cpp +++ b/src/domain/UBGraphicsDelegateFrame.cpp @@ -499,26 +499,27 @@ void UBGraphicsDelegateFrame::positionHandles() mTopResizeGrip->setParentItem(this); QRectF brRect = mBottomRightResizeGripSvgItem->mapRectToParent(mBottomRightResizeGripSvgItem->boundingRect()); - mBottomRightResizeGripSvgItem->setPos(rect().right() - brRect.width() - , rect().bottom() - brRect.height()); - QRectF bRect = mBottomResizeGripSvgItem->mapRectToParent(mBottomResizeGripSvgItem->boundingRect()); + QRectF lRect = mLeftResizeGripSvgItem->mapRectToParent(mLeftResizeGripSvgItem->boundingRect()); + QRectF rRect = mRightResizeGripSvgItem->mapRectToParent(mRightResizeGripSvgItem->boundingRect()); + QRectF trRect = mTopResizeGripSvgItem->mapRectToParent(mTopResizeGripSvgItem->boundingRect()); - mBottomResizeGripSvgItem->setPos(rect().center().x() - bRect.width() / 2 - , rect().bottom() - bRect.height()); + mBottomRightResizeGripSvgItem->setPos(rect().right() - brRect.width(), rect().bottom() - brRect.height()); + mBottomResizeGripSvgItem->setPos(rect().center().x() - bRect.width() / 2, rect().bottom() - bRect.height()); - QRectF lRect = mLeftResizeGripSvgItem->mapRectToParent(mLeftResizeGripSvgItem->boundingRect()); - mLeftResizeGripSvgItem->setPos(rect().left() - , rect().center().y() - lRect.height() / 2); + if(0 <= mScaleX){ + mLeftResizeGripSvgItem->setPos(rect().left(), rect().center().y() - lRect.height() / 2); + mRightResizeGripSvgItem->setPos(rect().right() - rRect.width(), rect().center().y() - rRect.height() / 2); + }else{ + mLeftResizeGripSvgItem->setPos(rect().right() - rRect.width(), rect().center().y() - lRect.height() / 2); + mRightResizeGripSvgItem->setPos(rect().left() , rect().center().y() - rRect.height() / 2); + } - QRectF rRect = mRightResizeGripSvgItem->mapRectToParent(mRightResizeGripSvgItem->boundingRect()); - mRightResizeGripSvgItem->setPos(rect().right() - rRect.width() - , rect().center().y() - rRect.height() / 2); + if(0 < mScaleY){ - QRectF trRect = mTopResizeGripSvgItem->mapRectToParent(mTopResizeGripSvgItem->boundingRect()); - mTopResizeGripSvgItem->setPos(rect().center().x() - trRect.width() / 2 - , rect().y()); + } + mTopResizeGripSvgItem->setPos(rect().center().x() - trRect.width() / 2, rect().y()); mRotateButton->setPos(rect().right() - mFrameWidth - 5, rect().top() + 5); mBottomRightResizeGrip->setRect(bottomRightResizeGripRect());