Add ifdefs for color

elementary · Nov 7, 2024 · 17a9cc1 · 17a9cc1
1 parent 3f417d6
commit 17a9cc1
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/compositor/Background/Background.vala b/compositor/Background/Background.vala
@@ -83,15 +83,38 @@ namespace GreeterCompositor {
             var settings = background_source.gnome_background_settings;
 
             color_string = settings.get_string ("primary-color");
+#if HAS_MUTTER47
+            var color = Cogl.Color.from_string (color_string);
+#else
             var color = Clutter.Color.from_string (color_string);
+#endif
+            if (color == null) {
+#if HAS_MUTTER47
+                color = Cogl.Color.from_string ("black");
+#else
+                color = Clutter.Color.from_string ("black");
+#endif
+            }
 
             var shading_type = settings.get_enum ("color-shading-type");
 
             if (shading_type == GDesktop.BackgroundShading.SOLID) {
                 background.set_color (color);
             } else {
                 color_string = settings.get_string ("secondary-color");
+#if HAS_MUTTER47
+                var second_color = Cogl.Color.from_string (color_string);
+#else
                 var second_color = Clutter.Color.from_string (color_string);
+#endif
+                if (second_color == null) {
+#if HAS_MUTTER47
+                    second_color = Cogl.Color.from_string ("black");
+#else
+                    second_color = Clutter.Color.from_string ("black");
+#endif
+                }
+
                 background.set_gradient ((GDesktop.BackgroundShading) shading_type, color, second_color);
             }
         }

diff --git a/compositor/Background/BackgroundContainer.vala b/compositor/Background/BackgroundContainer.vala
@@ -28,7 +28,11 @@ namespace GreeterCompositor {
         }
 
         public void set_black_background (bool black) {
+#if HAS_MUTTER47
+            set_background_color (black ? Cogl.Color.from_string ("Black") : null);
+#else
             set_background_color (black ? Clutter.Color.from_string ("Black") : null);
+#endif
         }
 
         private void update () {

diff --git a/compositor/WindowManager.vala b/compositor/WindowManager.vala
@@ -128,7 +128,11 @@ namespace GreeterCompositor {
             KeyboardManager.init (display);
 
             stage = display.get_stage () as Clutter.Stage;
+#if HAS_MUTTER47
+            stage.background_color = Cogl.Color.from_rgba (0, 0, 0, 255);
+#else
             stage.background_color = Clutter.Color.from_rgba (0, 0, 0, 255);
+#endif
 
             system_background = new SystemBackground (display);
             system_background.background_actor.add_constraint (new Clutter.BindConstraint (stage,