gdk/wayland: Look for font settings recursively

Use the infrastructure already available to look up keys, instead.
This does the right thing and looks up the setting across all
sources.

Fixes: https://gitlab.gnome.org/GNOME/gtk/-/issues/3680
This commit is contained in:
Carlos Garnacho 2021-02-18 16:12:53 +01:00
parent 4a47bdf596
commit 1fbdfe340e

View File

@ -1590,15 +1590,11 @@ update_xft_settings (GdkDisplay *display)
}
else
{
GSettingsSchemaSource *source;
GSettingsSchema *schema;
TranslationEntry *entry;
source = g_settings_schema_source_get_default ();
schema = g_settings_schema_source_lookup (source,
"org.gnome.desktop.interface",
FALSE);
entry = find_translation_entry_by_schema ("org.gnome.desktop.interface", "font-antialiasing");
if (schema && g_settings_schema_has_key (schema, "font-antialiasing"))
if (entry && entry->valid)
{
settings = g_hash_table_lookup (display_wayland->settings,
"org.gnome.desktop.interface");
@ -1622,9 +1618,6 @@ update_xft_settings (GdkDisplay *display)
order = GSD_FONT_RGBA_ORDER_RGB;
}
if (schema)
g_settings_schema_unref (schema);
dpi = get_dpi_from_gsettings (display_wayland) * 1024;
}