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

widget: Get DPI from style directly

Browse Source 
Instead of going through GtkStyleContext.
This commit is contained in:
Timm Bäder 2020-01-16 11:30:14 +01:00
parent 821efcb725
commit dda54b2b8f
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtkwidget.c
View File

@ -6583,15 +6583,14 @@ update_pango_context (GtkWidget *widget,
PangoContext *context) PangoContext *context)
{ {
GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget); GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
GtkCssStyle *style = gtk_css_node_get_style (priv->cssnode);
PangoFontDescription *font_desc; PangoFontDescription *font_desc;
GtkStyleContext *style_context;
GtkSettings *settings; GtkSettings *settings;
cairo_font_options_t *font_options; cairo_font_options_t *font_options;
GtkCssValue *value; GtkCssValue *value;
char *variations; char *variations;
style_context = _gtk_widget_get_style_context (widget); font_desc = gtk_css_style_get_pango_font (style);
font_desc = gtk_css_style_get_pango_font (gtk_css_node_get_style (priv->cssnode));
value = _gtk_style_context_peek_property (_gtk_widget_get_style_context (widget), GTK_CSS_PROPERTY_FONT_VARIATION_SETTINGS); value = _gtk_style_context_peek_property (_gtk_widget_get_style_context (widget), GTK_CSS_PROPERTY_FONT_VARIATION_SETTINGS);
variations = gtk_css_font_variations_value_get_variations (value); variations = gtk_css_font_variations_value_get_variations (value);
@ -6609,9 +6608,7 @@ update_pango_context (GtkWidget *widget,
pango_cairo_context_set_resolution (context, pango_cairo_context_set_resolution (context,
_gtk_css_number_value_get ( _gtk_css_number_value_get (
_gtk_style_context_peek_property (style_context, gtk_css_style_get_value (style, GTK_CSS_PROPERTY_DPI), 100));
GTK_CSS_PROPERTY_DPI),
100));
settings = gtk_widget_get_settings (widget); settings = gtk_widget_get_settings (widget);
font_options = (cairo_font_options_t*)g_object_get_qdata (G_OBJECT (widget), quark_font_options); font_options = (cairo_font_options_t*)g_object_get_qdata (G_OBJECT (widget), quark_font_options);