AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 14:10:30 +00:00
Code Issues Projects Releases Wiki Activity

textdisplay: save/restore when using different state flags

Browse Source 
Also, never use gtk_widget_get_state_flags() when we want
gtk_style_context_get_state()
This commit is contained in:
Benjamin Otte 2015-11-09 14:17:09 +01:00
parent 9757ea2c49
commit a0d9728e6c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtktextdisplay.c
View File

@ -183,7 +183,7 @@ gtk_text_renderer_prepare_run (PangoRenderer *renderer,
g_assert (appearance != NULL);
context = gtk_widget_get_style_context (text_renderer->widget);
state = gtk_widget_get_state_flags (text_renderer->widget);
state = gtk_style_context_get_state (context);
if (appearance->draw_bg && text_renderer->state == NORMAL)
bg_rgba = appearance->rgba[0];
@ -194,9 +194,14 @@ gtk_text_renderer_prepare_run (PangoRenderer *renderer,
if (text_renderer->state == SELECTED)
{
gtk_style_context_save (context);
state |= GTK_STATE_FLAG_SELECTED;
gtk_style_context_set_state (context, state);
gtk_style_context_get (context, state, "color", &fg_rgba, NULL);
gtk_style_context_restore (context);
}
else if (text_renderer->state == CURSOR && gtk_widget_has_focus (text_renderer->widget))
{
@ -523,7 +528,7 @@ text_renderer_begin (GtkTextRenderer *text_renderer,
gtk_style_context_save (context);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_VIEW);
state = gtk_widget_get_state_flags (widget);
state = gtk_style_context_get_state (context);
gtk_style_context_get_color (context, state, &color);
cairo_save (cr);
@ -820,7 +825,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
{
GdkRGBA color;
state = gtk_widget_get_state_flags (text_renderer->widget);
state = gtk_style_context_get_state (context);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_style_context_get_background_color (context, state, &color);
G_GNUC_END_IGNORE_DEPRECATIONS