[gnome-control-center/wip/hadess/fix-battery-colours: 6/6] power: Fix battery gauge colours




commit 1619d3078099bc25e0b62bbedcdde197b02721ce
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Nov 27 17:21:32 2020 +0100

    power: Fix battery gauge colours
    
    Calling gtk_css_provider_load_from_resource() twice will remove any
    already loaded resource instead of adding the new CSS with the old. Load
    each CSS individually instead.
    
    Fixes: f1bcaf1fbc1a103460fa807e07f01f961091ea63

 panels/power/cc-power-panel.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
index ab7695256..b72ff0b09 100644
--- a/panels/power/cc-power-panel.c
+++ b/panels/power/cc-power-panel.c
@@ -319,14 +319,14 @@ get_chassis_type (GCancellable *cancellable)
 }
 
 static void
-load_custom_css (CcPowerPanel *self)
+load_custom_css (CcPowerPanel *self,
+                 const char   *path)
 {
   g_autoptr(GtkCssProvider) provider = NULL;
 
   /* use custom CSS */
   provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_resource (provider, "/org/gnome/control-center/power/battery-levels.css");
-  gtk_css_provider_load_from_resource (provider, "/org/gnome/control-center/power/power-profiles.css");
+  gtk_css_provider_load_from_resource (provider, path);
   gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
                                              GTK_STYLE_PROVIDER (provider),
                                              GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
@@ -2210,7 +2210,8 @@ cc_power_panel_init (CcPowerPanel *self)
   g_resources_register (cc_power_get_resource ());
 
   gtk_widget_init_template (GTK_WIDGET (self));
-  load_custom_css (self);
+  load_custom_css (self, "/org/gnome/control-center/power/battery-levels.css");
+  load_custom_css (self, "/org/gnome/control-center/power/power-profiles.css");
 
   self->chassis_type = get_chassis_type (cc_panel_get_cancellable (CC_PANEL (self)));
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]