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

app: use gimp_scroll_adjustment_values() for scrolling the canvas

This commit is contained in:
Michael Natterer 2018-05-10 23:33:35 +02:00
parent 4a979995a3
commit 613d02ca3a
1 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/display/gimpdisplayshell-tool-events.c
View File

@ -730,11 +730,9 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
! gimp_controller_wheel_scroll (GIMP_CONTROLLER_WHEEL (wheel), ! gimp_controller_wheel_scroll (GIMP_CONTROLLER_WHEEL (wheel),
sevent)) sevent))
{ {
GdkScrollDirection direction = sevent->direction;
if (state & gimp_get_toggle_behavior_mask ()) if (state & gimp_get_toggle_behavior_mask ())
{ {
switch (direction) switch (sevent->direction)
{ {
case GDK_SCROLL_UP: case GDK_SCROLL_UP:
gimp_display_shell_scale (shell, gimp_display_shell_scale (shell,
@ -756,42 +754,16 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
} }
else else
{ {
GtkAdjustment *adj = NULL; gdouble value_x;
gdouble value; gdouble value_y;
if (state & GDK_SHIFT_MASK) gimp_scroll_adjustment_values (sevent,
switch (direction) shell->hsbdata,
{ shell->vsbdata,
case GDK_SCROLL_UP: direction = GDK_SCROLL_LEFT; break; &value_x, &value_y);
case GDK_SCROLL_DOWN: direction = GDK_SCROLL_RIGHT; break;
case GDK_SCROLL_LEFT: direction = GDK_SCROLL_UP; break;
case GDK_SCROLL_RIGHT: direction = GDK_SCROLL_DOWN; break;
}
switch (direction) gtk_adjustment_set_value (shell->hsbdata, value_x);
{ gtk_adjustment_set_value (shell->vsbdata, value_y);
case GDK_SCROLL_LEFT:
case GDK_SCROLL_RIGHT:
adj = shell->hsbdata;
break;
case GDK_SCROLL_UP:
case GDK_SCROLL_DOWN:
adj = shell->vsbdata;
break;
}
value = (gtk_adjustment_get_value (adj) +
((direction == GDK_SCROLL_UP ||
direction == GDK_SCROLL_LEFT) ?
-gtk_adjustment_get_page_increment (adj) / 2 :
gtk_adjustment_get_page_increment (adj) / 2));
value = CLAMP (value,
gtk_adjustment_get_lower (adj),
gtk_adjustment_get_upper (adj) -
gtk_adjustment_get_page_size (adj));
gtk_adjustment_set_value (adj, value);
} }
} }