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

Use CHECKED instead of ACTIVE for expanded expanders

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=733967
This commit is contained in:
Benjamin Otte
2014-08-27 21:25:53 +02:00
parent f1b14a33b5
commit 75ac49c475
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkexpander.c
View File

@ -888,9 +888,9 @@ gtk_expander_paint (GtkExpander *expander,
/* Set active flag as per the expanded state */ /* Set active flag as per the expanded state */
if (priv->expanded) if (priv->expanded)
state |= GTK_STATE_FLAG_ACTIVE; state |= GTK_STATE_FLAG_CHECKED;
else else
state &= ~(GTK_STATE_FLAG_ACTIVE); state &= ~(GTK_STATE_FLAG_CHECKED);
gtk_style_context_set_state (context, state); gtk_style_context_set_state (context, state);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_EXPANDER); gtk_style_context_add_class (context, GTK_STYLE_CLASS_EXPANDER);

2
gtk/gtkthemingengine.c
View File

@ -1859,7 +1859,7 @@ gtk_theming_engine_render_expander (GtkThemingEngine *engine,
is_rtl = (gtk_theming_engine_get_state (engine) & GTK_STATE_FLAG_DIR_RTL); is_rtl = (gtk_theming_engine_get_state (engine) & GTK_STATE_FLAG_DIR_RTL);
line_width = 1; 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)) if (!gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_HORIZONTAL))
{ {

2
gtk/gtktoolitemgroup.c
View File

@ -282,7 +282,7 @@ gtk_tool_item_group_header_draw_cb (GtkWidget *widget,
state = gtk_widget_get_state_flags (widget); state = gtk_widget_get_state_flags (widget);
if (!priv->collapsed) if (!priv->collapsed)
state |= GTK_STATE_FLAG_ACTIVE; state |= GTK_STATE_FLAG_CHECKED;
gtk_style_context_save (context); gtk_style_context_save (context);
gtk_style_context_set_state (context, state); gtk_style_context_set_state (context, state);

4
gtk/gtktreeview.c
View File

@ -10279,9 +10279,9 @@ gtk_tree_view_draw_arrow (GtkTreeView *tree_view,
state = gtk_cell_renderer_get_state (NULL, widget, flags); state = gtk_cell_renderer_get_state (NULL, widget, flags);
if (node->children != NULL) if (node->children != NULL)
state |= GTK_STATE_FLAG_ACTIVE; state |= GTK_STATE_FLAG_CHECKED;
else else
state &= ~(GTK_STATE_FLAG_ACTIVE); state &= ~(GTK_STATE_FLAG_CHECKED);
gtk_style_context_save (context); gtk_style_context_save (context);