@@ -2032,14 +2032,8 @@ void QgsComposerView::wheelZoom( QWheelEvent * event )
2032
2032
{
2033
2033
// get mouse wheel zoom behaviour settings
2034
2034
QSettings mySettings;
2035
- int wheelAction = mySettings.value ( " /qgis/wheel_action" , 2 ).toInt ();
2036
2035
double zoomFactor = mySettings.value ( " /qgis/zoom_factor" , 2 ).toDouble ();
2037
2036
2038
- if (( QgsMapCanvas::WheelAction )wheelAction == QgsMapCanvas::WheelNothing )
2039
- {
2040
- return ;
2041
- }
2042
-
2043
2037
if ( event->modifiers () & Qt::ControlModifier )
2044
2038
{
2045
2039
// holding ctrl while wheel zooming results in a finer zoom
@@ -2057,27 +2051,11 @@ void QgsComposerView::wheelZoom( QWheelEvent * event )
2057
2051
// transform the mouse pos to scene coordinates
2058
2052
QPointF scenePoint = mapToScene ( event->pos () );
2059
2053
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 () );
2081
2059
2082
2060
// zoom composition
2083
2061
if ( zoomIn )
0 commit comments