Merge branch 'main' into lenemter/put-menu-windows-on-top

Author: lenemter

lib/Drawing/StyleManager.vala

@@ -30,17 +30,19 @@ public class Gala.Drawing.StyleManager : Object {
 
     private const string FDO_ACCOUNTS_NAME = "org.freedesktop.Accounts";
     private const string FDO_ACCOUNTS_PATH = "/org/freedesktop/Accounts";
-
-    private const float ACCENT_COLOR_ALPHA = 0.25f;
-    private const Gdk.RGBA DEFAULT_ACCENT_COLOR = { 0, 0, 0, ACCENT_COLOR_ALPHA };
+    private const uint8 ACCENT_COLOR_ALPHA = 64;
 
     private static GLib.Once<StyleManager> instance;
     public static StyleManager get_instance () {
         return instance.once (() => new StyleManager ());
     }
 
     public ColorScheme prefers_color_scheme { get; private set; default = LIGHT; }
-    public Gdk.RGBA theme_accent_color { get; private set; default = DEFAULT_ACCENT_COLOR; }
+#if !HAS_MUTTER47
+    public Clutter.Color theme_accent_color { get; private set; default = { 0, 0, 0, ACCENT_COLOR_ALPHA }; }
+#else
+    public Cogl.Color theme_accent_color { get; private set; default = { 0, 0, 0, ACCENT_COLOR_ALPHA }; }
+#endif
 
     private PantheonAccountsService? pantheon_proxy;
     private SettingsDaemonAccountsService? settings_daemon_proxy;
@@ -94,16 +96,11 @@ public class Gala.Drawing.StyleManager : Object {
     private void update_color (int color) {
         var rgb = get_color (color);
 
-        var r = ((rgb >> 16) & 255) / 255.0f;
-        var g = ((rgb >> 8) & 255) / 255.0f;
-        var b = (rgb & 255) / 255.0f;
+        var r = (uint8) ((rgb >> 16) & 255);
+        var g = (uint8) ((rgb >> 8) & 255);
+        var b = (uint8) (rgb & 255);
 
-        theme_accent_color = {
-            r,
-            g,
-            b,
-            ACCENT_COLOR_ALPHA
-        };
+        theme_accent_color = { r, g, b, ACCENT_COLOR_ALPHA };
     }
 
     private int get_color (int color) {

meson.build

@@ -138,6 +138,10 @@ if mutter_dep.length() == 0
     error ('No supported mutter library found!')
 endif
 
+if libmutter_dep.version().version_compare('>= 48') and libmutter_dep.get_variable('have_fonts') == 'false'
+	error ('Gala requires mutter to be built with fonts rendering support!')
+endif
+
 mutter_typelib_dir = libmutter_dep.get_variable('typelibdir')
 
 if get_option('systemd')

src/HotCorners/HotCornerManager.vala

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 elementary, Inc (https://elementary.io)
+ * Copyright 2021-2025 elementary, Inc (https://elementary.io)
  *           2021 José Expósito <[email protected]>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -21,12 +21,11 @@ public class Gala.HotCornerManager : Object {
 
     public WindowManager wm { get; construct; }
     public GLib.Settings behavior_settings { get; construct; }
-    public GLib.Settings new_behavior_settings { get; construct; }
 
     private GLib.GenericArray<HotCorner> hot_corners;
 
-    public HotCornerManager (WindowManager wm, GLib.Settings behavior_settings, GLib.Settings new_behavior_settings) {
-        Object (wm: wm, behavior_settings: behavior_settings, new_behavior_settings: new_behavior_settings);
+    public HotCornerManager (WindowManager wm, GLib.Settings behavior_settings) {
+        Object (wm: wm, behavior_settings: behavior_settings);
 
         hot_corners = new GLib.GenericArray<HotCorner> ();
         behavior_settings.changed.connect (configure);
@@ -74,7 +73,7 @@ public class Gala.HotCornerManager : Object {
         hot_corner.trigger.connect (() => {
             if (
                 display.get_monitor_in_fullscreen (display.get_primary_monitor ()) &&
-                !new_behavior_settings.get_boolean ("enable-hotcorners-in-fullscreen")
+                !behavior_settings.get_boolean ("enable-hotcorners-in-fullscreen")
             ) {
                 return;
             }

src/Widgets/DwellClickTimer.vala

@@ -105,10 +105,10 @@ public class Gala.DwellClickTimer : Clutter.Actor, Clutter.Animatable {
         }
 
         var rgba = Drawing.StyleManager.get_instance ().theme_accent_color;
-
+        var red = rgba.red / 255.0, green = rgba.green / 255.0, blue = rgba.blue / 255.0;
+        stroke_color = new Cairo.Pattern.rgb (red, green, blue);
         /* Don't use alpha from the stylesheet to ensure contrast */
-        stroke_color = new Cairo.Pattern.rgb (rgba.red, rgba.green, rgba.blue);
-        fill_color = new Cairo.Pattern.rgba (rgba.red, rgba.green, rgba.blue, BACKGROUND_OPACITY);
+        fill_color = new Cairo.Pattern.rgba (red, green, blue, BACKGROUND_OPACITY);
 
         var radius = int.min (cursor_size / 2, cursor_size / 2);
         var end_angle = START_ANGLE + angle;

src/Widgets/MultitaskingView/WindowClone.vala

@@ -629,13 +629,7 @@ public class Gala.WindowClone : ActorTarget, RootTarget {
         }
 
         public void update_color () {
-            var accent_color = Drawing.StyleManager.get_instance ().theme_accent_color;
-            background_color = {
-                (uint8) (accent_color.red * uint8.MAX),
-                (uint8) (accent_color.green * uint8.MAX),
-                (uint8) (accent_color.blue * uint8.MAX),
-                (uint8) (COLOR_OPACITY * uint8.MAX)
-            };
+            background_color = Drawing.StyleManager.get_instance ().theme_accent_color;
         }
     }
 }

src/Widgets/PointerLocator.vala

@@ -132,10 +132,10 @@ public class Gala.PointerLocator : Clutter.Actor, Clutter.Animatable {
         add_transition ("circle", transition);
 
         var rgba = Drawing.StyleManager.get_instance ().theme_accent_color;
-
+        var red = rgba.red / 255.0, green = rgba.green / 255.0, blue = rgba.blue / 255.0;
+        stroke_color = new Cairo.Pattern.rgb (red, green, blue);
         /* Don't use alpha from the stylesheet to ensure contrast */
-        stroke_color = new Cairo.Pattern.rgb (rgba.red, rgba.green, rgba.blue);
-        fill_color = new Cairo.Pattern.rgba (rgba.red, rgba.green, rgba.blue, BACKGROUND_OPACITY);
+        fill_color = new Cairo.Pattern.rgba (red, green, blue, BACKGROUND_OPACITY);
 
 #if HAS_MUTTER48
         unowned var tracker = display.get_compositor ().get_backend ().get_cursor_tracker ();

src/Widgets/WindowSwitcher/WindowSwitcherIcon.vala

@@ -15,19 +15,9 @@ public class Gala.WindowSwitcherIcon : Clutter.Actor {
     public bool selected {
         set {
             if (value) {
-                var accent_color = Drawing.StyleManager.get_instance ().theme_accent_color;
-                background_color = {
-                    (uint8) (accent_color.red * uint8.MAX),
-                    (uint8) (accent_color.green * uint8.MAX),
-                    (uint8) (accent_color.blue * uint8.MAX),
-                    (uint8) (accent_color.alpha * uint8.MAX)
-                };
+                background_color = Drawing.StyleManager.get_instance ().theme_accent_color;
             } else {
-#if HAS_MUTTER47
-                background_color = Cogl.Color.from_4f (0, 0, 0, 0);
-#else
-                background_color = Clutter.Color.alloc ();
-#endif
+                background_color = { 0, 0, 0, 0 };
             }
 
             get_accessible ().notify_state_change (Atk.StateType.SELECTED, value);

src/WindowManager.vala

@@ -112,7 +112,6 @@ namespace Gala {
         private Clutter.Actor? latest_window_snapshot;
 
         private GLib.Settings behavior_settings;
-        private GLib.Settings new_behavior_settings;
 
         construct {
 #if !HAS_MUTTER48
@@ -121,7 +120,6 @@ namespace Gala {
 #endif
 
             behavior_settings = new GLib.Settings ("io.elementary.desktop.wm.behavior");
-            new_behavior_settings = new GLib.Settings ("io.elementary.desktop.wm.behavior");
 
             //Make it start watching the settings daemon bus
             Drawing.StyleManager.get_instance ();
@@ -374,7 +372,7 @@ namespace Gala {
             unowned var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
             monitor_manager.monitors_changed.connect (update_ui_group_size);
 
-            hot_corner_manager = new HotCornerManager (this, behavior_settings, new_behavior_settings);
+            hot_corner_manager = new HotCornerManager (this, behavior_settings);
             hot_corner_manager.on_configured.connect (update_input_area);
             hot_corner_manager.configure ();
 
@@ -957,18 +955,13 @@ namespace Gala {
 
         public override void show_tile_preview (Meta.Window window, Mtk.Rectangle tile_rect, int tile_monitor_number) {
             if (tile_preview == null) {
-                tile_preview = new Clutter.Actor ();
-                var rgba = Drawing.StyleManager.get_instance ().theme_accent_color;
-                tile_preview.background_color = {
-                    (uint8)(255.0 * rgba.red),
-                    (uint8)(255.0 * rgba.green),
-                    (uint8)(255.0 * rgba.blue),
-                    (uint8)(255.0 * rgba.alpha)
+                tile_preview = new Clutter.Actor () {
+                    background_color = Drawing.StyleManager.get_instance ().theme_accent_color,
+                    opacity = 0
                 };
-                tile_preview.opacity = 0U;
 
                 window_group.add_child (tile_preview);
-            } else if (tile_preview.is_visible ()) {
+            } else {
                 float width, height, x, y;
                 tile_preview.get_position (out x, out y);
                 tile_preview.get_size (out width, out height);