callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkSwitch: Don't store dest_offset

Browse Source 
Instead, calculate it on the spot in the tick callback, and
update handle_x in gtk_switch_set_active, based on the new
active property.
This commit is contained in:
Matthias Clasen
2014-08-04 14:30:23 +02:00
parent d4bd9e9c46
commit 2e85046b8f
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/gtkswitch.c
View File

@ -68,7 +68,6 @@ struct _GtkSwitchPrivate
gint handle_x; gint handle_x;
gint offset; gint offset;
gint dest_offset;
gint drag_start; gint drag_start;
gint drag_threshold; gint drag_threshold;
gint64 start_time; gint64 start_time;
@ -153,15 +152,20 @@ gtk_switch_on_frame_clock_update (GdkFrameClock *clock,
if (now < priv->end_time) if (now < priv->end_time)
{ {
gdouble t; gdouble t;
gint dest_offset;
if (priv->is_active)
dest_offset = 0;
else
dest_offset = gtk_widget_get_allocated_width (GTK_WIDGET (sw)) / 2;
t = (now - priv->start_time) / (gdouble) (priv->end_time - priv->start_time); t = (now - priv->start_time) / (gdouble) (priv->end_time - priv->start_time);
t = ease_out_cubic (t); t = ease_out_cubic (t);
priv->handle_x = priv->offset + t * (priv->dest_offset - priv->offset); priv->handle_x = priv->offset + t * (dest_offset - priv->offset);
} }
else else
{ {
gtk_switch_set_active (sw, !priv->is_active); gtk_switch_set_active (sw, !priv->is_active);
priv->handle_x = priv->dest_offset;
} }
gtk_widget_queue_draw (GTK_WIDGET (sw)); gtk_widget_queue_draw (GTK_WIDGET (sw));
@ -173,15 +177,8 @@ static void
gtk_switch_begin_toggle_animation (GtkSwitch *sw) gtk_switch_begin_toggle_animation (GtkSwitch *sw)
{ {
GtkSwitchPrivate *priv = sw->priv; GtkSwitchPrivate *priv = sw->priv;
GtkAllocation allocation;
gboolean animate; gboolean animate;
gtk_widget_get_allocation (GTK_WIDGET (sw), &allocation);
if (priv->is_active)
priv->dest_offset = 0;
else
priv->dest_offset = allocation.width / 2;
g_object_get (gtk_widget_get_settings (GTK_WIDGET (sw)), g_object_get (gtk_widget_get_settings (GTK_WIDGET (sw)),
"gtk-enable-animations", &animate, "gtk-enable-animations", &animate,
NULL); NULL);
@ -201,7 +198,6 @@ gtk_switch_begin_toggle_animation (GtkSwitch *sw)
else else
{ {
gtk_switch_set_active (sw, !priv->is_active); gtk_switch_set_active (sw, !priv->is_active);
priv->handle_x = priv->dest_offset;
} }
} }
@ -1096,6 +1092,11 @@ gtk_switch_set_active (GtkSwitch *sw,
priv->is_active = is_active; priv->is_active = is_active;
if (priv->is_active)
priv->handle_x = gtk_widget_get_allocated_width (GTK_WIDGET (sw)) / 2;
else
priv->handle_x = 0;
g_object_notify_by_pspec (G_OBJECT (sw), switch_props[PROP_ACTIVE]); g_object_notify_by_pspec (G_OBJECT (sw), switch_props[PROP_ACTIVE]);
g_signal_emit (sw, signals[STATE_SET], 0, is_active, &handled); g_signal_emit (sw, signals[STATE_SET], 0, is_active, &handled);