From 75ac49c475444cb69cac08dade70feac22eca1e6 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 27 Aug 2014 21:25:53 +0200 Subject: [PATCH] Use CHECKED instead of ACTIVE for expanded expanders https://bugzilla.gnome.org/show_bug.cgi?id=733967 --- gtk/gtkexpander.c | 4 ++-- gtk/gtkthemingengine.c | 2 +- gtk/gtktoolitemgroup.c | 2 +- gtk/gtktreeview.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c index dc2d4c2f43..e8bf4b8d9c 100644 --- a/gtk/gtkexpander.c +++ b/gtk/gtkexpander.c @@ -888,9 +888,9 @@ gtk_expander_paint (GtkExpander *expander, /* Set active flag as per the expanded state */ if (priv->expanded) - state |= GTK_STATE_FLAG_ACTIVE; + state |= GTK_STATE_FLAG_CHECKED; else - state &= ~(GTK_STATE_FLAG_ACTIVE); + state &= ~(GTK_STATE_FLAG_CHECKED); gtk_style_context_set_state (context, state); gtk_style_context_add_class (context, GTK_STYLE_CLASS_EXPANDER); diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c index 1aa60113a0..9248b907d4 100644 --- a/gtk/gtkthemingengine.c +++ b/gtk/gtkthemingengine.c @@ -1859,7 +1859,7 @@ gtk_theming_engine_render_expander (GtkThemingEngine *engine, is_rtl = (gtk_theming_engine_get_state (engine) & GTK_STATE_FLAG_DIR_RTL); line_width = 1; - progress = (flags & GTK_STATE_FLAG_ACTIVE) ? 1 : 0; + progress = (flags & GTK_STATE_FLAG_CHECKED) ? 1 : 0; if (!gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_HORIZONTAL)) { diff --git a/gtk/gtktoolitemgroup.c b/gtk/gtktoolitemgroup.c index 94a937b5f4..94655b7536 100644 --- a/gtk/gtktoolitemgroup.c +++ b/gtk/gtktoolitemgroup.c @@ -282,7 +282,7 @@ gtk_tool_item_group_header_draw_cb (GtkWidget *widget, state = gtk_widget_get_state_flags (widget); if (!priv->collapsed) - state |= GTK_STATE_FLAG_ACTIVE; + state |= GTK_STATE_FLAG_CHECKED; gtk_style_context_save (context); gtk_style_context_set_state (context, state); diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 48cdede79f..da1526cb55 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -10279,9 +10279,9 @@ gtk_tree_view_draw_arrow (GtkTreeView *tree_view, state = gtk_cell_renderer_get_state (NULL, widget, flags); if (node->children != NULL) - state |= GTK_STATE_FLAG_ACTIVE; + state |= GTK_STATE_FLAG_CHECKED; else - state &= ~(GTK_STATE_FLAG_ACTIVE); + state &= ~(GTK_STATE_FLAG_CHECKED); gtk_style_context_save (context);