AlmaLinux changes: Show both icon and workspace indicator in panel

This commit is contained in:
Andrew Lukoshko 2025-05-20 16:33:23 +00:00
parent 244a9e592d
commit c95667265a
2 changed files with 52 additions and 1 deletions

View File

@ -0,0 +1,45 @@
From 7f183e4aaa76d581e773fa415e5bcd9e5e54b3cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Hern=C3=A1ndez=20Ant=C3=BAnez?=
<javi@almalinux.org>
Date: Tue, 20 May 2025 01:04:03 +0200
Subject: [PATCH] panel: Bring the upstream workspace dots back
The activities button now includes both the icon and the workspace
indicators.
Also, remove the distribution id check.
---
js/ui/panel.js | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/js/ui/panel.js b/js/ui/panel.js
index 5e19203be..314c839a1 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -423,15 +423,14 @@ class ActivitiesButton extends PanelMenu.Button {
accessible_name: _('Activities'),
});
- if (GLib.get_os_info('ID') === 'rhel') {
- const logoIcon = new St.Icon({
- icon_name: 'fedora-logo-icon',
- style_class: 'activities-logo',
- });
- this.add_child(logoIcon);
- } else {
- this.add_child(new WorkspaceIndicators());
- }
+ const box = new St.BoxLayout({vertical: false});
+ const logoIcon = new St.Icon({
+ icon_name: 'fedora-logo-icon',
+ style_class: 'activities-logo',
+ });
+ box.add_child(logoIcon);
+ box.add_child(new WorkspaceIndicators());
+ this.add_child(box);
Main.overview.connectObject('showing',
() => this.add_style_pseudo_class('checked'),
--
2.47.1

View File

@ -5,7 +5,7 @@
release_number = 2; release_number = 2;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1); print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}.alma.2}
## END: Set by rpmautospec ## END: Set by rpmautospec
%global tarball_version %%(echo %{version} | tr '~' '.') %global tarball_version %%(echo %{version} | tr '~' '.')
@ -56,6 +56,9 @@ Patch: fix-some-js-warnings.patch
Patch: 0001-data-Update-generated-stylesheets.patch Patch: 0001-data-Update-generated-stylesheets.patch
Patch: 0001-theme-Welcome-Illustration.patch Patch: 0001-theme-Welcome-Illustration.patch
# AlmaLinux
Patch: 0001-panel-Bring-the-upstream-workspace-dots-back.patch
%define eds_version 3.45.1 %define eds_version 3.45.1
%define gnome_desktop_version 44.0-7 %define gnome_desktop_version 44.0-7
%define glib2_version 2.79.2 %define glib2_version 2.79.2
@ -287,6 +290,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.Porta
%changelog %changelog
## START: Generated by rpmautospec ## START: Generated by rpmautospec
* Tue May 20 2025 Javier Hernández <javi@almalinux.org> - 47.4-2.alma.2
- AlmaLinux changes: Show both icon and workspace indicator in panel
* Fri Feb 14 2025 Florian Müllner <fmuellner@redhat.com> - 47.4-2 * Fri Feb 14 2025 Florian Müllner <fmuellner@redhat.com> - 47.4-2
- data: Tweak app defaults - data: Tweak app defaults