Updated all parts to the last stable version

patches/accent-color-Always-expose-and-use-yaru-accent-colors-val.patch

@@ -0,0 +1,111 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[email protected]>
+Date: Wed, 14 Aug 2024 22:27:29 -0400
+Subject: accent-color: Always expose and use yaru accent colors values when
+ in Yaru
+
+When running in yaru mode we want to make sure the apps will always use
+the yaru colors, so expose them both via the css variables and the API
+values
+---
+ src/adw-accent-color.c      | 56 ++++++++++++++++++++++++++++++++++++++-------
+ src/stylesheet/_colors.scss | 12 ++++++++++
+ 2 files changed, 60 insertions(+), 8 deletions(-)
+
+diff --git a/src/adw-accent-color.c b/src/adw-accent-color.c
+index fa937aa..89abce0 100644
+--- a/src/adw-accent-color.c
++++ b/src/adw-accent-color.c
+@@ -11,17 +11,19 @@
+
+ #include "adw-color-utils-private.h"
+
++#include "adw-settings-private.h"
++
+ /**
+  * AdwAccentColor:
+- * @ADW_ACCENT_COLOR_BLUE: Use a blue color (`#3584e4`). This is the default value.
+- * @ADW_ACCENT_COLOR_TEAL: Use a teal color (`#2190a4`).
+- * @ADW_ACCENT_COLOR_GREEN: Use a green color (`#3a944a`).
++ * @ADW_ACCENT_COLOR_BLUE: Use a blue color (`#3584e4` or `#0073e5` in Yaru). This is the default value.
++ * @ADW_ACCENT_COLOR_TEAL: Use a teal color (`#2190a4` or `#4b8501` in Yaru).
++ * @ADW_ACCENT_COLOR_GREEN: Use a green color (`#3a944a` or `#4b8501` in Yaru).
+  * @ADW_ACCENT_COLOR_YELLOW: Use a yellow color (`#c88800`).
+- * @ADW_ACCENT_COLOR_ORANGE: Use a orange color (`#ed5b00`).
+- * @ADW_ACCENT_COLOR_RED: Use a red color (`#e62d42`).
+- * @ADW_ACCENT_COLOR_PINK: Use a pink color (`#d56199`).
+- * @ADW_ACCENT_COLOR_PURPLE: Use a purple color (`#9141ac`).
+- * @ADW_ACCENT_COLOR_SLATE: Use a slate color (`#6f8396`).
++ * @ADW_ACCENT_COLOR_ORANGE: Use a orange color (`#ed5b00` or `#e95420` in Yaru).
++ * @ADW_ACCENT_COLOR_RED: Use a red color (`#e62d42` or `#da3450` in Yaru).
++ * @ADW_ACCENT_COLOR_PINK: Use a pink color (`#d56199` or `#b34cb3` in Yaru).
++ * @ADW_ACCENT_COLOR_PURPLE: Use a purple color (`#9141ac` or `#7764d8` in Yaru).
++ * @ADW_ACCENT_COLOR_SLATE: Use a slate color (`#6f8396` or `#657b69` in Yaru).
+  *
+  * Describes the available system accent colors.
+  *
+@@ -49,6 +51,44 @@ adw_accent_color_to_rgba (AdwAccentColor  self,
+   g_return_if_fail (self <= ADW_ACCENT_COLOR_SLATE);
+   g_return_if_fail (rgba != NULL);
+
++  if (G_LIKELY (adw_settings_get_yaru_accent (adw_settings_get_default ())))
++    {
++      switch (self) {
++      case ADW_ACCENT_COLOR_BLUE:
++        hex = "#0073e5";
++        break;
++      case ADW_ACCENT_COLOR_TEAL:
++        hex = "#308280";
++        break;
++      case ADW_ACCENT_COLOR_GREEN:
++        hex = "#4b8501";
++        break;
++      case ADW_ACCENT_COLOR_YELLOW:
++        hex = "#c88800";
++        break;
++      case ADW_ACCENT_COLOR_ORANGE:
++        hex = "#e95420";
++        break;
++      case ADW_ACCENT_COLOR_RED:
++        hex = "#da3450";
++        break;
++      case ADW_ACCENT_COLOR_PINK:
++        hex = "#b34cb3";
++        break;
++      case ADW_ACCENT_COLOR_PURPLE:
++        hex = "#7764d8";
++        break;
++      case ADW_ACCENT_COLOR_SLATE:
++        hex = "#657b69";
++        break;
++      default:
++        g_assert_not_reached ();
++      }
++
++      if (rgba)
++        gdk_rgba_parse (rgba, hex);
++    }
++
+   switch (self) {
+   case ADW_ACCENT_COLOR_BLUE:
+     hex = "#3584e4";
+diff --git a/src/stylesheet/_colors.scss b/src/stylesheet/_colors.scss
+index 4c47949..4accb71 100644
+--- a/src/stylesheet/_colors.scss
++++ b/src/stylesheet/_colors.scss
+@@ -142,4 +142,16 @@ $is_yaru: false !default;
+ @if $is_yaru {
+   $link_color: var(--yaru-link-color);
+   $link_visited_color: var(--yaru-link-visited-color);
++
++  :root {
++    --accent-blue: #0073e5;
++    --accent-teal: #308280;
++    --accent-green: #4b8501;
++    --accent-yellow: #c88800;
++    --accent-orange: #e95420;
++    --accent-red: #da3450;
++    --accent-pink: #b34cb3;
++    --accent-purple: #7764d8;
++    --accent-slate: #657b69;
++  }
+ }

patches/accent-color-Return-return-orange-as-default-color.patch

@@ -0,0 +1,136 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[email protected]>
+Date: Wed, 14 Aug 2024 15:20:44 -0400
+Subject: accent-color: Return return orange as default color
+
+---
+ src/adw-accent-color.c         |  2 +-
+ src/adw-settings-impl-macos.c  |  2 +-
+ src/adw-settings-impl-portal.c |  2 +-
+ src/adw-settings-impl.c        |  2 +-
+ src/adw-settings.c             | 10 ++++++----
+ src/adw-style-manager.c        |  4 ++--
+ 6 files changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/src/adw-accent-color.c b/src/adw-accent-color.c
+index f49b63b..fa937aa 100644
+--- a/src/adw-accent-color.c
++++ b/src/adw-accent-color.c
+@@ -161,7 +161,7 @@ adw_accent_color_nearest_from_rgba (GdkRGBA *original_color)
+ {
+   float L, c, h;
+
+-  g_return_val_if_fail (original_color != NULL, ADW_ACCENT_COLOR_BLUE);
++  g_return_val_if_fail (original_color != NULL, ADW_ACCENT_COLOR_ORANGE);
+
+   adw_rgb_to_oklch (original_color->red,
+                     original_color->green,
+diff --git a/src/adw-settings-impl-macos.c b/src/adw-settings-impl-macos.c
+index 75b0fd9..2212e10 100644
+--- a/src/adw-settings-impl-macos.c
++++ b/src/adw-settings-impl-macos.c
+@@ -57,7 +57,7 @@ get_accent_color (void)
+     return adw_accent_color_nearest_from_rgba (&rgba);
+   }
+
+-  return ADW_ACCENT_COLOR_BLUE;
++  return ADW_ACCENT_COLOR_ORANGE;
+ }
+
+ -(void)appDidChangeAccentColor:(NSNotification *)notification
+diff --git a/src/adw-settings-impl-portal.c b/src/adw-settings-impl-portal.c
+index 6984aa1..00725b0 100644
+--- a/src/adw-settings-impl-portal.c
++++ b/src/adw-settings-impl-portal.c
+@@ -127,7 +127,7 @@ get_fdo_accent_color (GVariant *variant)
+   g_variant_get (variant, "(ddd)", &r, &g, &b);
+
+   if (r < 0 || g < 0 || b < 0 || r > 1 || g > 1 || b > 1)
+-    return ADW_ACCENT_COLOR_BLUE;
++    return ADW_ACCENT_COLOR_ORANGE;
+
+   rgba.red = r;
+   rgba.green = g;
+diff --git a/src/adw-settings-impl.c b/src/adw-settings-impl.c
+index 536eca6..e8b402e 100644
+--- a/src/adw-settings-impl.c
++++ b/src/adw-settings-impl.c
+@@ -192,7 +192,7 @@ adw_settings_impl_get_accent_color (AdwSettingsImpl *self)
+ {
+   AdwSettingsImplPrivate *priv  = adw_settings_impl_get_instance_private (self);
+
+-  g_return_val_if_fail (ADW_IS_SETTINGS_IMPL (self), ADW_ACCENT_COLOR_BLUE);
++  g_return_val_if_fail (ADW_IS_SETTINGS_IMPL (self), ADW_ACCENT_COLOR_ORANGE);
+
+   return priv->accent_color;
+ }
+diff --git a/src/adw-settings.c b/src/adw-settings.c
+index 4187f79..a8ead17 100644
+--- a/src/adw-settings.c
++++ b/src/adw-settings.c
+@@ -199,6 +199,8 @@ adw_settings_constructed (GObject *object)
+
+   G_OBJECT_CLASS (adw_settings_parent_class)->constructed (object);
+
++  self->accent_color = ADW_ACCENT_COLOR_ORANGE;
++
+   init_debug (self, &found_color_scheme, &found_high_contrast, &found_accent_colors);
+
+   if (!found_color_scheme || !found_high_contrast || !found_accent_colors) {
+@@ -319,7 +321,7 @@ adw_settings_class_init (AdwSettingsClass *klass)
+   props[PROP_ACCENT_COLOR] =
+     g_param_spec_enum ("accent-color", NULL, NULL,
+                        ADW_TYPE_ACCENT_COLOR,
+-                       ADW_ACCENT_COLOR_BLUE,
++                       ADW_ACCENT_COLOR_ORANGE,
+                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+   g_object_class_install_properties (object_class, LAST_PROP, props);
+@@ -386,7 +388,7 @@ adw_settings_get_system_supports_accent_colors (AdwSettings *self)
+ AdwAccentColor
+ adw_settings_get_accent_color (AdwSettings *self)
+ {
+-  g_return_val_if_fail (ADW_IS_SETTINGS (self), ADW_ACCENT_COLOR_BLUE);
++  g_return_val_if_fail (ADW_IS_SETTINGS (self), ADW_ACCENT_COLOR_ORANGE);
+
+   if (self->override)
+     return self->accent_color_override;
+@@ -433,7 +435,7 @@ adw_settings_end_override (AdwSettings *self)
+   self->color_scheme_override = ADW_SYSTEM_COLOR_SCHEME_DEFAULT;
+   self->high_contrast_override = FALSE;
+   self->system_supports_accent_colors_override = FALSE;
+-  self->accent_color_override = ADW_ACCENT_COLOR_BLUE;
++  self->accent_color_override = ADW_ACCENT_COLOR_ORANGE;
+
+   if (notify_system_supports_color_scheme)
+     g_object_notify_by_pspec (G_OBJECT (self), props[PROP_SYSTEM_SUPPORTS_COLOR_SCHEMES]);
+@@ -513,7 +515,7 @@ adw_settings_override_system_supports_accent_colors (AdwSettings *self,
+     return;
+
+   if (!system_supports_accent_colors)
+-    adw_settings_override_accent_color (self, ADW_ACCENT_COLOR_BLUE);
++    adw_settings_override_accent_color (self, ADW_ACCENT_COLOR_ORANGE);
+
+   self->system_supports_accent_colors_override = system_supports_accent_colors;
+
+diff --git a/src/adw-style-manager.c b/src/adw-style-manager.c
+index 71f6915..1206636 100644
+--- a/src/adw-style-manager.c
++++ b/src/adw-style-manager.c
+@@ -583,7 +583,7 @@ adw_style_manager_class_init (AdwStyleManagerClass *klass)
+   props[PROP_ACCENT_COLOR] =
+     g_param_spec_enum ("accent-color", NULL, NULL,
+                        ADW_TYPE_ACCENT_COLOR,
+-                       ADW_ACCENT_COLOR_BLUE,
++                       ADW_ACCENT_COLOR_ORANGE,
+                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+
+   /**
+@@ -887,7 +887,7 @@ adw_style_manager_get_system_supports_accent_colors (AdwStyleManager *self)
+ AdwAccentColor
+ adw_style_manager_get_accent_color (AdwStyleManager *self)
+ {
+-  g_return_val_if_fail (ADW_IS_STYLE_MANAGER (self), ADW_ACCENT_COLOR_BLUE);
++  g_return_val_if_fail (ADW_IS_STYLE_MANAGER (self), ADW_ACCENT_COLOR_ORANGE);
+
+   return adw_settings_get_accent_color (self->settings);
+ }