diff options
| author | Bastien Nocera <hadess@hadess.net> | 2021-04-23 12:30:15 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2021-04-29 16:37:33 +0200 |
| commit | 5535ac00663fa393f29a5983e638e91bbd9f5d31 (patch) | |
| tree | 889c096516f88b5290a0cf591ca835bf5e4027e6 | |
| parent | 9033b1ba93afed344c659f9e314f6e9a86381707 (diff) | |
| download | gnome-control-center-5535ac00663fa393f29a5983e638e91bbd9f5d31.tar.gz | |
info-overview: Look for -text and -dark logo variants
When loading the LOGO icon name from /etc/os-release, append -text to
prefer a textual variant of the logo if it exists, and -dark if the
theme variant is dark.
This allows distributors to ship textual and dark variants of their
logos without adding more fields to /etc/os-release, or more code
specific to logo handling for specific distributions.
$LOGO: default icon
$LOGO-dark: default icon when dark theme is used
$LOGO-text: icon with text
$LOGO-text-dark: icon with text when dark theme is used
| -rw-r--r-- | panels/info-overview/cc-info-overview-panel.c | 23 | ||||
| -rw-r--r-- | panels/info-overview/cc-info-overview-panel.ui | 1 |
2 files changed, 23 insertions, 1 deletions
diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c index a2cb70755..a215b254a 100644 --- a/panels/info-overview/cc-info-overview-panel.c +++ b/panels/info-overview/cc-info-overview-panel.c @@ -862,13 +862,34 @@ cc_info_panel_row_activated_cb (CcInfoOverviewPanel *self, open_software_update (self); } +static const char * +get_asset_suffix (CcInfoOverviewPanel *panel) +{ + GdkScreen *screen; + GtkSettings *settings; + g_autofree char *theme_name = NULL; + + theme_name = g_strdup (g_getenv ("GTK_THEME")); + if (theme_name != NULL) + return g_str_has_suffix (theme_name, "dark") ? "-dark" : ""; + + screen = gtk_widget_get_screen (GTK_WIDGET (panel)); + settings = gtk_settings_get_for_screen (screen); + + g_object_get (settings, "gtk-theme-name", &theme_name, NULL); + return (theme_name != NULL && g_str_has_suffix (theme_name, "dark")) ? "-dark" : ""; +} + static void setup_os_logo (CcInfoOverviewPanel *panel) { g_autofree char *logo_name = g_get_os_info ("LOGO"); if (logo_name != NULL) { - gtk_image_set_from_icon_name (panel->os_logo, logo_name, GTK_ICON_SIZE_INVALID); + g_autofree char *logo_name_with_variant = NULL; + + logo_name_with_variant = g_strdup_printf ("%s-text%s", logo_name, get_asset_suffix (panel)); + gtk_image_set_from_icon_name (panel->os_logo, logo_name_with_variant, GTK_ICON_SIZE_INVALID); gtk_image_set_pixel_size (panel->os_logo, 256); } else diff --git a/panels/info-overview/cc-info-overview-panel.ui b/panels/info-overview/cc-info-overview-panel.ui index 2f5d3cf8b..451aa09ee 100644 --- a/panels/info-overview/cc-info-overview-panel.ui +++ b/panels/info-overview/cc-info-overview-panel.ui @@ -28,6 +28,7 @@ <object class="GtkImage" id="os_logo"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="use_fallback">True</property> </object> <packing> <property name="expand">False</property> |