Skip to content

Commit

Permalink
[composer] Fix snapping during item resize incorrectly snapping to mo…
Browse files Browse the repository at this point in the history 
…use cursor rather then item boundary (fix #9443)
  • Loading branch information
@nyalldawson
nyalldawson committed Feb 1, 2014
1 parent 346df98 commit e0a1d09
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 22 deletions.
90 changes: 68 additions & 22 deletions src/core/composer/qgscomposermousehandles.cpp
View file
Expand Up @@ -705,15 +705,59 @@ void QgsComposerMouseHandles::mousePressEvent( QGraphicsSceneMouseEvent* event )

if ( mCurrentMouseMoveAction == QgsComposerMouseHandles::MoveItem )
{
//moving items
mIsDragging = true;
}
else if ( mCurrentMouseMoveAction != QgsComposerMouseHandles::SelectItem &&
mCurrentMouseMoveAction != QgsComposerMouseHandles::NoAction )
{
//resizing items
mIsResizing = true;
mResizeRect = QRectF( 0, 0, mBeginHandleWidth, mBeginHandleHeight );
mResizeMoveX = 0;
mResizeMoveY = 0;
mCursorOffset = calcCursorEdgeOffset( mMouseMoveStartPos );

}

}

QSizeF QgsComposerMouseHandles::calcCursorEdgeOffset( const QPointF &cursorPos )
{
//find offset between cursor position and actual edge of item
QPointF sceneMousePos = mapFromScene( cursorPos );

switch ( mCurrentMouseMoveAction )
{
//vertical resize
case QgsComposerMouseHandles::ResizeUp:
return QSizeF( 0, sceneMousePos.y() );

case QgsComposerMouseHandles::ResizeDown:
return QSizeF( 0, sceneMousePos.y() - rect().height() );

//horizontal resize
case QgsComposerMouseHandles::ResizeLeft:
return QSizeF( sceneMousePos.x(), 0 );

case QgsComposerMouseHandles::ResizeRight:
return QSizeF( sceneMousePos.x() - rect().width(), 0 );

//diagonal resize
case QgsComposerMouseHandles::ResizeLeftUp:
return QSizeF( sceneMousePos.x(), sceneMousePos.y() );

case QgsComposerMouseHandles::ResizeRightDown:
return QSizeF( sceneMousePos.x() - rect().width(), sceneMousePos.y() - rect().height() );

case QgsComposerMouseHandles::ResizeRightUp:
return QSizeF( sceneMousePos.x() - rect().width(), sceneMousePos.y() );

case QgsComposerMouseHandles::ResizeLeftDown:
return QSizeF( sceneMousePos.x(), sceneMousePos.y() - rect().height() );

default:
return QSizeF( 0, 0 );
}

}
Expand Down Expand Up @@ -779,18 +823,16 @@ void QgsComposerMouseHandles::resizeMouseMove( const QPointF& currentPosition, b
return;
}

QPointF beginMousePos = mapFromScene( mBeginMouseEventPos );

double mx = 0.0, my = 0.0, rx = 0.0, ry = 0.0;
QPointF snappedPosition = snapPoint( currentPosition, QgsComposerMouseHandles::Point );

//QPointF currentPosHandle = mapFromScene( currentPosition );
//subtract cursor edge offset from begin mouse event and current cursor position, so that snapping occurs to edge of mouse handles
//rather then cursor position
QPointF beginMousePos = mapFromScene( QPointF( mBeginMouseEventPos.x() - mCursorOffset.width(), mBeginMouseEventPos.y() - mCursorOffset.height() ) );
QPointF snappedPosition = snapPoint( QPointF( currentPosition.x() - mCursorOffset.width(), currentPosition.y() - mCursorOffset.height() ), QgsComposerMouseHandles::Point );
snappedPosition = mapFromScene( snappedPosition );
double diffX = 0;
double diffY = 0;

diffX = snappedPosition.x() - beginMousePos.x();
diffY = snappedPosition.y() - beginMousePos.y();
double diffX = snappedPosition.x() - beginMousePos.x();
double diffY = snappedPosition.y() - beginMousePos.y();

double ratio = 0;
if ( lockRatio && mBeginHandleHeight != 0 )
Expand All @@ -802,7 +844,7 @@ void QgsComposerMouseHandles::resizeMouseMove( const QPointF& currentPosition, b
{
//vertical resize
case QgsComposerMouseHandles::ResizeUp:
//diffY = snappedPosition.y() - beginMousePos.y();
{
if ( ratio )
{
diffX = (( mBeginHandleHeight - diffY ) * ratio ) - mBeginHandleWidth;
Expand All @@ -813,9 +855,10 @@ void QgsComposerMouseHandles::resizeMouseMove( const QPointF& currentPosition, b
mx = 0; my = diffY; rx = 0; ry = -diffY;
}
break;
}

case QgsComposerMouseHandles::ResizeDown:
//diffY = snappedPosition.y() - beginMousePos.y();
{
if ( ratio )
{
diffX = (( mBeginHandleHeight + diffY ) * ratio ) - mBeginHandleWidth;
Expand All @@ -826,10 +869,11 @@ void QgsComposerMouseHandles::resizeMouseMove( const QPointF& currentPosition, b
mx = 0; my = 0; rx = 0; ry = diffY;
}
break;
}

//horizontal resize
//horizontal resize
case QgsComposerMouseHandles::ResizeLeft:
//diffX = snappedPosition.x() - beginMousePos.x();
{
if ( ratio )
{
diffY = (( mBeginHandleWidth - diffX ) / ratio ) - mBeginHandleHeight;
Expand All @@ -840,9 +884,10 @@ void QgsComposerMouseHandles::resizeMouseMove( const QPointF& currentPosition, b
mx = diffX, my = 0; rx = -diffX; ry = 0;
}
break;
}

case QgsComposerMouseHandles::ResizeRight:
//diffX = snappedPosition.x() - ( beginMousePos.x() + mBeginHandleWidth );
{
if ( ratio )
{
diffY = (( mBeginHandleWidth + diffX ) / ratio ) - mBeginHandleHeight;
Expand All @@ -853,11 +898,11 @@ void QgsComposerMouseHandles::resizeMouseMove( const QPointF& currentPosition, b
mx = 0; my = 0; rx = diffX, ry = 0;
}
break;
}

//diagonal resize
//diagonal resize
case QgsComposerMouseHandles::ResizeLeftUp:
//diffX = snappedPosition.x() - beginMousePos.x();
diffY = snappedPosition.y() - beginMousePos.y();
{
if ( ratio )
{
//ratio locked resize
Expand All @@ -872,10 +917,10 @@ void QgsComposerMouseHandles::resizeMouseMove( const QPointF& currentPosition, b
}
mx = diffX, my = diffY; rx = -diffX; ry = -diffY;
break;
}

case QgsComposerMouseHandles::ResizeRightDown:
//diffX = snappedPosition.x() - ( beginMousePos.x() + mBeginHandleWidth );
//diffY = snappedPosition.y() - ( beginMousePos.y() + mBeginHandleHeight );
{
if ( ratio )
{
//ratio locked resize
Expand All @@ -890,10 +935,10 @@ void QgsComposerMouseHandles::resizeMouseMove( const QPointF& currentPosition, b
}
mx = 0; my = 0; rx = diffX, ry = diffY;
break;
}

case QgsComposerMouseHandles::ResizeRightUp:
//diffX = snappedPosition.x() - ( beginMousePos.x() + mBeginHandleWidth );
//diffY = snappedPosition.y() - beginMousePos.y();
{
if ( ratio )
{
//ratio locked resize
Expand All @@ -908,10 +953,10 @@ void QgsComposerMouseHandles::resizeMouseMove( const QPointF& currentPosition, b
}
mx = 0; my = diffY, rx = diffX, ry = -diffY;
break;
}

case QgsComposerMouseHandles::ResizeLeftDown:
//diffX = snappedPosition.x() - beginMousePos.x();
//diffY = snappedPosition.y() - ( beginMousePos.y() + mBeginHandleHeight );
{
if ( ratio )
{
//ratio locked resize
Expand All @@ -926,6 +971,7 @@ void QgsComposerMouseHandles::resizeMouseMove( const QPointF& currentPosition, b
}
mx = diffX, my = 0; rx = -diffX; ry = diffY;
break;
}

case QgsComposerMouseHandles::MoveItem:
case QgsComposerMouseHandles::SelectItem:
Expand Down
6 changes: 6 additions & 0 deletions src/core/composer/qgscomposermousehandles.h
View file
Expand Up @@ -129,6 +129,8 @@ class CORE_EXPORT QgsComposerMouseHandles: public QObject, public QGraphicsRectI
QGraphicsLineItem* mHAlignSnapItem;
QGraphicsLineItem* mVAlignSnapItem;

QSizeF mCursorOffset;

/**Returns the mouse handle bounds of current selection*/
QRectF selectionBounds() const;

Expand All @@ -154,6 +156,10 @@ class CORE_EXPORT QgsComposerMouseHandles: public QObject, public QGraphicsRectI

/**Handles dragging of items during mouse move*/
void dragMouseMove( const QPointF& currentPosition, bool lockMovement, bool preventSnap );

/**Calculates the distance of the mouse cursor from thed edge of the mouse handles*/
QSizeF calcCursorEdgeOffset( const QPointF &cursorPos );

/**Handles resizing of items during mouse move*/
void resizeMouseMove( const QPointF& currentPosition, bool lockAspect, bool fromCenter );

Expand Down

0 comments on commit e0a1d09

Please sign in to comment.