procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-04 01:43:24 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

Merge branch 'wip/estecka/live-slider-shift' into 'master'

Browse source 
Issue #4699: Allow Shift to be toggled during an ongoing slider drag.

Closes #4699

See merge request GNOME/gimp!2274
This commit is contained in:
Estecka 2025-06-30 02:50:16 +00:00
commit 80b3639c52
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
libgimpwidgets/gimpspinscale.c
View file

@ -76,6 +76,7 @@ struct _GimpSpinScale
PangoLayout *layout; PangoLayout *layout;
gboolean changing_value; gboolean changing_value;
gboolean relative_change; gboolean relative_change;
gboolean always_relative;
gdouble start_x; gdouble start_x;
gdouble start_value; gdouble start_value;
gint start_pointer_x; gint start_pointer_x;
@ -819,28 +820,21 @@ gimp_spin_scale_button_press (GtkWidget *widget,
{ {
case TARGET_GRAB: case TARGET_GRAB:
case TARGET_GRABBING: case TARGET_GRABBING:
scale->changing_value = TRUE;
gtk_widget_grab_focus (widget);
gimp_spin_scale_change_value (widget, x, event->state);
gimp_spin_scale_update_cursor (widget, event->window);
return TRUE;
case TARGET_RELATIVE: case TARGET_RELATIVE:
scale->changing_value = TRUE; scale->changing_value = TRUE;
gtk_widget_grab_focus (widget); gtk_widget_grab_focus (widget);
scale->relative_change = TRUE; scale->always_relative = event->button == 3;
scale->relative_change = scale->target == TARGET_RELATIVE;
scale->start_x = x; scale->start_x = x;
scale->start_value = gtk_adjustment_get_value (gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget))); scale->start_value = gtk_adjustment_get_value (gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget)));
scale->start_pointer_x = floor (event->x_root); scale->start_pointer_x = floor (event->x_root);
scale->start_pointer_y = floor (event->y_root); scale->start_pointer_y = floor (event->y_root);
gimp_spin_scale_change_value (widget, x, event->state);
gimp_spin_scale_update_cursor (widget, event->window); gimp_spin_scale_update_cursor (widget, event->window);
return TRUE; return TRUE;
@ -925,6 +919,7 @@ gimp_spin_scale_motion_notify (GtkWidget *widget,
GdkDisplay *display; GdkDisplay *display;
gint pointer_x; gint pointer_x;
gint pointer_y; gint pointer_y;
gboolean shift_down;
GdkMonitor *monitor; GdkMonitor *monitor;
GdkRectangle monitor_geometry; GdkRectangle monitor_geometry;
@ -934,9 +929,18 @@ gimp_spin_scale_motion_notify (GtkWidget *widget,
pointer_x = floor (event->x_root); pointer_x = floor (event->x_root);
pointer_y = floor (event->y_root); pointer_y = floor (event->y_root);
shift_down = (event->state & GDK_SHIFT_MASK);
monitor = gdk_display_get_monitor_at_point (display, pointer_x, pointer_y); monitor = gdk_display_get_monitor_at_point (display, pointer_x, pointer_y);
gdk_monitor_get_geometry (monitor, &monitor_geometry); gdk_monitor_get_geometry (monitor, &monitor_geometry);
if (! scale->always_relative && scale->relative_change != shift_down)
{
scale->relative_change = shift_down;
scale->target = shift_down ? TARGET_RELATIVE : TARGET_GRABBING;
gimp_spin_scale_update_cursor (widget, event->window);
}
/* when applying a relative change, we wrap the pointer around the left /* when applying a relative change, we wrap the pointer around the left
* and right edges of the current monitor, so that the adjustment is not * and right edges of the current monitor, so that the adjustment is not
* limited by the monitor geometry. when the pointer reaches one of the * limited by the monitor geometry. when the pointer reaches one of the