Skip to content

Commit f9a10e4

Browse files
committedMay 29, 2016
Remove deprecated wheel action behaviour from composer
1 parent d6ec868 commit f9a10e4

File tree

1 file changed

+5
-27
lines changed

1 file changed

+5
-27
lines changed
 

‎src/gui/qgscomposerview.cpp

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2032,14 +2032,8 @@ void QgsComposerView::wheelZoom( QWheelEvent * event )
20322032
{
20332033
//get mouse wheel zoom behaviour settings
20342034
QSettings mySettings;
2035-
int wheelAction = mySettings.value( "/qgis/wheel_action", 2 ).toInt();
20362035
double zoomFactor = mySettings.value( "/qgis/zoom_factor", 2 ).toDouble();
20372036

2038-
if (( QgsMapCanvas::WheelAction )wheelAction == QgsMapCanvas::WheelNothing )
2039-
{
2040-
return;
2041-
}
2042-
20432037
if ( event->modifiers() & Qt::ControlModifier )
20442038
{
20452039
//holding ctrl while wheel zooming results in a finer zoom
@@ -2057,27 +2051,11 @@ void QgsComposerView::wheelZoom( QWheelEvent * event )
20572051
//transform the mouse pos to scene coordinates
20582052
QPointF scenePoint = mapToScene( event->pos() );
20592053

2060-
//adjust view center according to wheel action setting
2061-
switch (( QgsMapCanvas::WheelAction )wheelAction )
2062-
{
2063-
case QgsMapCanvas::WheelZoomAndRecenter:
2064-
{
2065-
centerOn( scenePoint.x(), scenePoint.y() );
2066-
break;
2067-
}
2068-
2069-
case QgsMapCanvas::WheelZoomToMouseCursor:
2070-
{
2071-
QgsPoint oldCenter( visibleRect.center() );
2072-
QgsPoint newCenter( scenePoint.x() + (( oldCenter.x() - scenePoint.x() ) * scaleFactor ),
2073-
scenePoint.y() + (( oldCenter.y() - scenePoint.y() ) * scaleFactor ) );
2074-
centerOn( newCenter.x(), newCenter.y() );
2075-
break;
2076-
}
2077-
2078-
default:
2079-
break;
2080-
}
2054+
//adjust view center
2055+
QgsPoint oldCenter( visibleRect.center() );
2056+
QgsPoint newCenter( scenePoint.x() + (( oldCenter.x() - scenePoint.x() ) * scaleFactor ),
2057+
scenePoint.y() + (( oldCenter.y() - scenePoint.y() ) * scaleFactor ) );
2058+
centerOn( newCenter.x(), newCenter.y() );
20812059

20822060
//zoom composition
20832061
if ( zoomIn )

0 commit comments

Comments
 (0)
Please sign in to comment.