dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libgimpwidgets: Introduce GIMP_ZOOM_PINCH 

This zoom mode is handled pretty much the same as GIMP_ZOOM_SMOOTH
except that we do not apply adjustments for the scaling delta. Pinch
zooming is ultimately a different physical activity than smooth
scrolling and users likely expect different sensitivity.
This commit is contained in:
Povilas Kanapickas 2021-01-26 22:14:44 +02:00 committed by Jehan
parent 877d585271
commit 51d1ab9bce
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libgimpwidgets/gimpwidgetsenums.h
View File

@ -216,6 +216,7 @@ typedef enum
* @GIMP_ZOOM_OUT_MAX: zoom out as far as possible * @GIMP_ZOOM_OUT_MAX: zoom out as far as possible
* @GIMP_ZOOM_TO: zoom to a specific zoom factor * @GIMP_ZOOM_TO: zoom to a specific zoom factor
* @GIMP_ZOOM_SMOOTH: zoom smoothly from a smooth scroll event * @GIMP_ZOOM_SMOOTH: zoom smoothly from a smooth scroll event
* @GIMP_ZOOM_PINCH: zoom smoothly from a touchpad pinch gesture
* *
* the zoom types for #GimpZoomModel. * the zoom types for #GimpZoomModel.
**/ **/
@ -232,7 +233,8 @@ typedef enum
GIMP_ZOOM_IN_MAX, /*< skip >*/ GIMP_ZOOM_IN_MAX, /*< skip >*/
GIMP_ZOOM_OUT_MAX, /*< skip >*/ GIMP_ZOOM_OUT_MAX, /*< skip >*/
GIMP_ZOOM_TO, /*< skip >*/ GIMP_ZOOM_TO, /*< skip >*/
GIMP_ZOOM_SMOOTH /*< skip >*/ GIMP_ZOOM_SMOOTH, /*< skip >*/
GIMP_ZOOM_PINCH, /*< skip >*/
} GimpZoomType; } GimpZoomType;

8
libgimpwidgets/gimpzoommodel.c
View File

@ -705,6 +705,14 @@ gimp_zoom_model_zoom_step (GimpZoomType zoom_type,
new_scale = scale; new_scale = scale;
break; break;
case GIMP_ZOOM_PINCH:
if (delta > 0.0)
new_scale = scale * (1.0 + delta);
else if (delta < 0.0)
new_scale = scale / (1.0 + -delta);
else
new_scale = scale;
break;
} }
return CLAMP (new_scale, ZOOM_MIN, ZOOM_MAX); return CLAMP (new_scale, ZOOM_MIN, ZOOM_MAX);