AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-16 15:14:17 +00:00
Code Issues Projects Releases Wiki Activity

switch: fix boundaries for the switch motion

Browse Source 
We were ignoring the focus ring padding, and we were incorrectly setting
handle_x to padding.left, while the draw handler already takes padding
into account while redrawing.

https://bugzilla.gnome.org/show_bug.cgi?id=645134
This commit is contained in:
Cosimo Cecchi 2011-03-17 18:27:03 -04:00
parent 6e1aa0e0a9
commit 55c86bd44d
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/gtkswitch.c
View File

@ -162,17 +162,30 @@ gtk_switch_motion (GtkWidget *widget,
GtkStyleContext *context; GtkStyleContext *context;
GtkStateFlags state; GtkStateFlags state;
GtkBorder padding; GtkBorder padding;
gint width, focus_width, focus_pad;
gtk_widget_style_get (widget,
"focus-line-width", &focus_width,
"focus-padding", &focus_pad,
NULL);
context = gtk_widget_get_style_context (widget); context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget); state = gtk_widget_get_state_flags (widget);
gtk_style_context_save (context);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_SLIDER);
gtk_style_context_get_padding (context, state, &padding); gtk_style_context_get_padding (context, state, &padding);
gtk_style_context_restore (context);
gtk_widget_get_allocation (widget, &allocation); gtk_widget_get_allocation (widget, &allocation);
width = allocation.width - 2 * (focus_width + focus_pad);
/* constrain the handle within the trough width */ /* constrain the handle within the trough width */
if (position > (allocation.width / 2 - padding.right)) if (position > (width / 2) - padding.right)
priv->handle_x = allocation.width / 2 - padding.right; priv->handle_x = width / 2 - padding.right;
else if (position < padding.left) else if (position < padding.left)
priv->handle_x = padding.left; priv->handle_x = 0;
else else
priv->handle_x = position; priv->handle_x = position;