AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gskpango: Stop using style context getters

Browse Source 
Just go to the css nodes directly.
This commit is contained in:
Matthias Clasen 2020-01-18 09:50:04 -05:00
parent 7da6fdc30e
commit 731ae8f39e
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gtk/gskpango.c
View File

@ -23,9 +23,11 @@
#include "gsk/gskrendernodeprivate.h" #include "gsk/gskrendernodeprivate.h"
#include "gskpango.h" #include "gskpango.h"
#include "gtksnapshotprivate.h" #include "gtksnapshotprivate.h"
#include "gtkstylecontextprivate.h"
#include "gtktextlayoutprivate.h" #include "gtktextlayoutprivate.h"
#include "gtktextviewprivate.h" #include "gtktextviewprivate.h"
#include "gtkwidgetprivate.h"
#include "gtkcssnodeprivate.h"
#include "gtkcsscolorvalueprivate.h"
#include <math.h> #include <math.h>
@ -307,7 +309,6 @@ static void
gsk_pango_renderer_prepare_run (PangoRenderer *renderer, gsk_pango_renderer_prepare_run (PangoRenderer *renderer,
PangoLayoutRun *run) PangoLayoutRun *run)
{ {
GtkStyleContext *context;
GskPangoRenderer *crenderer = GSK_PANGO_RENDERER (renderer); GskPangoRenderer *crenderer = GSK_PANGO_RENDERER (renderer);
GdkRGBA *bg_rgba = NULL; GdkRGBA *bg_rgba = NULL;
GdkRGBA *fg_rgba = NULL; GdkRGBA *fg_rgba = NULL;
@ -320,8 +321,6 @@ gsk_pango_renderer_prepare_run (PangoRenderer *renderer,
if (appearance == NULL) if (appearance == NULL)
return; return;
context = gtk_widget_get_style_context (crenderer->widget);
if (appearance->draw_bg && crenderer->state == GSK_PANGO_RENDERER_NORMAL) if (appearance->draw_bg && crenderer->state == GSK_PANGO_RENDERER_NORMAL)
bg_rgba = appearance->bg_rgba; bg_rgba = appearance->bg_rgba;
else else
@ -332,22 +331,21 @@ gsk_pango_renderer_prepare_run (PangoRenderer *renderer,
if (crenderer->state == GSK_PANGO_RENDERER_SELECTED && if (crenderer->state == GSK_PANGO_RENDERER_SELECTED &&
GTK_IS_TEXT_VIEW (crenderer->widget)) GTK_IS_TEXT_VIEW (crenderer->widget))
{ {
GtkCssNode *selection_node; GtkCssNode *node;
GtkCssValue *value;
selection_node = gtk_text_view_get_selection_node ((GtkTextView *)crenderer->widget); node = gtk_text_view_get_selection_node ((GtkTextView *)crenderer->widget);
gtk_style_context_save_to_node (context, selection_node); value = gtk_css_style_get_value (gtk_css_node_get_style (node), GTK_CSS_PROPERTY_COLOR);
fg_rgba = (GdkRGBA *)gtk_css_color_value_get_rgba (value);
gtk_style_context_get (context,
"color", &fg_rgba,
NULL);
gtk_style_context_restore (context);
} }
else if (crenderer->state == GSK_PANGO_RENDERER_CURSOR && gtk_widget_has_focus (crenderer->widget)) else if (crenderer->state == GSK_PANGO_RENDERER_CURSOR && gtk_widget_has_focus (crenderer->widget))
{ {
gtk_style_context_get (context, GtkCssNode *node;
"background-color", &fg_rgba, GtkCssValue *value;
NULL);
node = gtk_widget_get_css_node (crenderer->widget);
value = gtk_css_style_get_value (gtk_css_node_get_style (node), GTK_CSS_PROPERTY_BACKGROUND_COLOR);
fg_rgba = (GdkRGBA *)gtk_css_color_value_get_rgba (value);
} }
else else
fg_rgba = appearance->fg_rgba; fg_rgba = appearance->fg_rgba;