AlmaLinux changes: Show both icon and workspace indicator in panel

Also, remove distribution id check.
This commit is contained in:
Javier Hernández 2025-05-20 00:09:40 +02:00
parent ec725abbb3
commit 37e3a73051

View File

@ -1,16 +1,16 @@
From c0b2f60108e7b8cffa10306ef54c620fe71a6735 Mon Sep 17 00:00:00 2001 From 7db2b70f7801813e22c444c118df2a95add3eb6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org> From: =?UTF-8?q?Javier=20Hern=C3=A1ndez=20Ant=C3=BAnez?=
Date: Wed, 22 May 2024 18:42:06 +0200 <javi@almalinux.org>
Date: Mon, 19 May 2025 17:33:52 +0200
Subject: [PATCH] panel: Use branding in activities button Subject: [PATCH] panel: Use branding in activities button
Replace the upstream workspace dots with a red hat.
--- ---
data/theme/gnome-shell-sass/widgets/_panel.scss | 5 +++++ data/theme/gnome-shell-sass/widgets/_panel.scss | 5 +++++
js/ui/panel.js | 10 +++++++++- js/ui/panel.js | 9 ++++++++-
2 files changed, 14 insertions(+), 1 deletion(-) 2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/data/theme/gnome-shell-sass/widgets/_panel.scss b/data/theme/gnome-shell-sass/widgets/_panel.scss diff --git a/data/theme/gnome-shell-sass/widgets/_panel.scss b/data/theme/gnome-shell-sass/widgets/_panel.scss
index 2a29eee9da..02f8232de6 100644 index 2a29eee9d..02f8232de 100644
--- a/data/theme/gnome-shell-sass/widgets/_panel.scss --- a/data/theme/gnome-shell-sass/widgets/_panel.scss
+++ b/data/theme/gnome-shell-sass/widgets/_panel.scss +++ b/data/theme/gnome-shell-sass/widgets/_panel.scss
@@ -58,6 +58,11 @@ $panel_transition_duration: 250ms; // same as the overview transition duration @@ -58,6 +58,11 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
@ -26,26 +26,25 @@ index 2a29eee9da..02f8232de6 100644
// screen activity indicators // screen activity indicators
diff --git a/js/ui/panel.js b/js/ui/panel.js diff --git a/js/ui/panel.js b/js/ui/panel.js
index 62c8ebb31a..1d11cc1b5f 100644 index b8d05634c..dfdb07a98 100644
--- a/js/ui/panel.js --- a/js/ui/panel.js
+++ b/js/ui/panel.js +++ b/js/ui/panel.js
@@ -425,7 +425,15 @@ class ActivitiesButton extends PanelMenu.Button { @@ -423,7 +423,14 @@ class ActivitiesButton extends PanelMenu.Button {
accessible_name: _('Activities'), accessible_name: _('Activities'),
}); });
- this.add_child(new WorkspaceIndicators()); - this.add_child(new WorkspaceIndicators());
+ if (GLib.get_os_info('ID') === 'almalinux') { + const box = new St.BoxLayout({ vertical: false });
+ const logoIcon = new St.Icon({ + const logoIcon = new St.Icon({
+ icon_name: 'fedora-logo-icon', + icon_name: 'fedora-logo-icon',
+ style_class: 'activities-logo', + style_class: 'activities-logo',
+ }); + });
+ this.add_child(logoIcon); + box.add_child(logoIcon);
+ } else { + box.add_child(new WorkspaceIndicators());
+ this.add_child(new WorkspaceIndicators()); + this.add_child(box);
+ }
Main.overview.connectObject('showing', Main.overview.connectObject('showing',
() => this.add_style_pseudo_class('checked'), () => this.add_style_pseudo_class('checked'),
-- --
2.45.2 2.47.1