diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-02-18 17:18:37 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-02-18 17:18:37 +0000 |
commit | 447e6db847b970902561bb7f47366072c0f25be3 (patch) | |
tree | bd4105aa8bb02f78d39a9bed4153539e9bdf415c | |
parent | 4a47bdf596482fa371d3f7922ea304c7d6229be3 (diff) | |
parent | 1fbdfe340ec5108a8c5a1dd1db3442aad3d2e55e (diff) | |
download | gtk+-447e6db847b970902561bb7f47366072c0f25be3.tar.gz |
Merge branch 'wip/carlosg/font-setting-lookups' into 'master'
gdk/wayland: Look for font settings recursively
Closes #3680
See merge request GNOME/gtk!3218
-rw-r--r-- | gdk/wayland/gdkdisplay-wayland.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index 41e8b5f5a7..88fab19d55 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -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; } |