From 1c57abb02b7b1c235b0b8f3c241246447b7b196c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 21 Jun 2014 21:34:50 -0400 Subject: [PATCH] GtkSwitch: Implement hover for GtkSwitch This makes switches more similar to other activatable widgets like buttons or scales. --- gtk/gtkswitch.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c index 0d0469847a..4e5c421029 100644 --- a/gtk/gtkswitch.c +++ b/gtk/gtkswitch.c @@ -245,7 +245,10 @@ gtk_switch_enter (GtkWidget *widget, GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv; if (event->window == priv->event_window) - priv->in_switch = TRUE; + { + priv->in_switch = TRUE; + gtk_widget_queue_draw (widget); + } return FALSE; } @@ -257,7 +260,10 @@ gtk_switch_leave (GtkWidget *widget, GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv; if (event->window == priv->event_window) - priv->in_switch = FALSE; + { + priv->in_switch = FALSE; + gtk_widget_queue_draw (widget); + } return FALSE; } @@ -464,9 +470,14 @@ gtk_switch_paint_handle (GtkWidget *widget, cairo_t *cr, GdkRectangle *box) { + GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv; GtkStyleContext *context = gtk_widget_get_style_context (widget); + GtkStateFlags state = gtk_widget_get_state_flags (widget); gtk_style_context_save (context); + if (priv->in_switch) + state |= GTK_STATE_FLAG_PRELIGHT; + gtk_style_context_set_state (context, state); gtk_style_context_add_class (context, GTK_STYLE_CLASS_SLIDER); gtk_render_slider (context, cr,