/pidgin/main: 1fe9aba16440: Fix state flags used to draw GtkCell...

Changeset: 1fe9aba164406f8a0bf69f3a8dbb3af8f9483684
Author:	 Elliott Sales de Andrade <[email protected]>
Date:	 2016-09-04 05:01 -0400
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/1fe9aba16440

Description:

Fix state flags used to draw GtkCellRendererExpander.

These incorrect state flags prevented the expander from rendering as
"open".

diffstat:

 pidgin/gtkcellrendererexpander.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (46 lines):

diff --git a/pidgin/gtkcellrendererexpander.c b/pidgin/gtkcellrendererexpander.c
--- a/pidgin/gtkcellrendererexpander.c
+++ b/pidgin/gtkcellrendererexpander.c
@@ -240,7 +240,7 @@ pidgin_cell_renderer_expander_render(Gtk
 	PidginCellRendererExpander *cellexpander = (PidginCellRendererExpander *) cell;
 	gboolean set;
 	gint width, height;
-	GtkStateType state;
+	GtkStateFlags state;
 	gint xpad;
 	gint ypad;
 	gboolean is_expanded;
@@ -257,26 +257,26 @@ pidgin_cell_renderer_expander_render(Gtk
 	height = cell_area->height;
 
 	if (!gtk_widget_get_sensitive(widget))
-		state = GTK_STATE_INSENSITIVE;
+		state = GTK_STATE_FLAG_INSENSITIVE;
 	else if (flags & GTK_CELL_RENDERER_PRELIT)
-		state = GTK_STATE_PRELIGHT;
+		state = GTK_STATE_FLAG_PRELIGHT;
 	else if (gtk_widget_has_focus(widget) && flags & GTK_CELL_RENDERER_SELECTED)
-		state = GTK_STATE_ACTIVE;
+		state = GTK_STATE_FLAG_ACTIVE;
 	else
-		state = GTK_STATE_NORMAL;
+		state = GTK_STATE_FLAG_NORMAL;
 
 	width -= xpad*2;
 	height -= ypad*2;
 
 	if (is_expanded)
-		state |= GTK_STATE_ACTIVE;
+		state |= GTK_STATE_FLAG_CHECKED;
 	else
-		state &= ~GTK_STATE_ACTIVE;
+		state &= ~GTK_STATE_FLAG_CHECKED;
 
 	context = gtk_widget_get_style_context(widget);
 	gtk_style_context_add_class(context, GTK_STYLE_CLASS_VIEW);
 	gtk_style_context_add_class(context, GTK_STYLE_CLASS_EXPANDER);
-	gtk_style_context_set_state(context, (GtkStateFlags)state);
+	gtk_style_context_set_state(context, state);
 	gtk_render_expander(context, cr,
 	                    cell_area->x + xpad, cell_area->y + ypad,
 	                    width, height);

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits