From 76da514fb826114479b11ceeaa31278cfd78ea3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 23 May 2024 12:32:22 +0200 Subject: [PATCH] Add downstream branding Replace the workspace indicator in the activities button with the Red Hat logo. Resolves: DESKTOP-979 --- 0001-data-Update-generated-stylesheets.patch | 54 +++++-- ...el-Use-branding-in-activities-button.patch | 144 ++++++++++++++++++ gnome-shell.spec | 1 + 3 files changed, 187 insertions(+), 12 deletions(-) create mode 100644 0001-panel-Use-branding-in-activities-button.patch diff --git a/0001-data-Update-generated-stylesheets.patch b/0001-data-Update-generated-stylesheets.patch index c480355..2ba4c55 100644 --- a/0001-data-Update-generated-stylesheets.patch +++ b/0001-data-Update-generated-stylesheets.patch @@ -1,19 +1,29 @@ -From b92d3d070a2f397d6588af99dcb4a8cb98f65b8c Mon Sep 17 00:00:00 2001 +From 1701444c175e0d782427104326e761d7195e2b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 16 Apr 2024 20:49:40 +0200 Subject: [PATCH] data: Update generated stylesheets --- - data/theme/gnome-shell-dark.css | 4 ++++ - data/theme/gnome-shell-high-contrast.css | 4 ++++ - data/theme/gnome-shell-light.css | 4 ++++ - 3 files changed, 12 insertions(+) + data/theme/gnome-shell-dark.css | 7 +++++++ + data/theme/gnome-shell-high-contrast.css | 7 +++++++ + data/theme/gnome-shell-light.css | 7 +++++++ + 3 files changed, 21 insertions(+) diff --git a/data/theme/gnome-shell-dark.css b/data/theme/gnome-shell-dark.css -index 70ca5deaa4..76c3334873 100644 +index 70ca5deaa4..f593b13e34 100644 --- a/data/theme/gnome-shell-dark.css +++ b/data/theme/gnome-shell-dark.css -@@ -2917,6 +2917,10 @@ StScrollBar { +@@ -1688,6 +1688,9 @@ StScrollBar { + min-width: 0.5455em; + min-height: 0.5455em; + background-color: #ffffff; } ++ #panel .panel-button#panelActivities .activities-logo { ++ icon-size: 1.36375em; ++ padding: 0 6px; } + #panel .panel-button.screen-recording-indicator StBoxLayout, #panel .panel-button.screen-sharing-indicator StBoxLayout { + spacing: 0.409em; } + #panel .panel-button.screen-recording-indicator StIcon, #panel .panel-button.screen-sharing-indicator StIcon { +@@ -2917,6 +2920,10 @@ StScrollBar { .login-dialog-message { text-align: center; } @@ -25,10 +35,20 @@ index 70ca5deaa4..76c3334873 100644 padding-top: 4em; padding-bottom: 8em; } diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css -index 2751b77209..3e326542db 100644 +index 2751b77209..8bb8eadf09 100644 --- a/data/theme/gnome-shell-high-contrast.css +++ b/data/theme/gnome-shell-high-contrast.css -@@ -3211,6 +3211,10 @@ StScrollBar { +@@ -1870,6 +1870,9 @@ StScrollBar { + min-width: 0.5455em; + min-height: 0.5455em; + background-color: #ffffff; } ++ #panel .panel-button#panelActivities .activities-logo { ++ icon-size: 1.36375em; ++ padding: 0 6px; } + #panel .panel-button.screen-recording-indicator StBoxLayout, #panel .panel-button.screen-sharing-indicator StBoxLayout { + spacing: 0.409em; } + #panel .panel-button.screen-recording-indicator StIcon, #panel .panel-button.screen-sharing-indicator StIcon { +@@ -3211,6 +3214,10 @@ StScrollBar { .login-dialog-message { text-align: center; } @@ -40,10 +60,20 @@ index 2751b77209..3e326542db 100644 padding-top: 4em; padding-bottom: 8em; } diff --git a/data/theme/gnome-shell-light.css b/data/theme/gnome-shell-light.css -index 263ecd87f0..7ef7063367 100644 +index 263ecd87f0..64d5672d6c 100644 --- a/data/theme/gnome-shell-light.css +++ b/data/theme/gnome-shell-light.css -@@ -2917,6 +2917,10 @@ StScrollBar { +@@ -1688,6 +1688,9 @@ StScrollBar { + min-width: 0.5455em; + min-height: 0.5455em; + background-color: #282828; } ++ #panel .panel-button#panelActivities .activities-logo { ++ icon-size: 1.36375em; ++ padding: 0 6px; } + #panel .panel-button.screen-recording-indicator StBoxLayout, #panel .panel-button.screen-sharing-indicator StBoxLayout { + spacing: 0.409em; } + #panel .panel-button.screen-recording-indicator StIcon, #panel .panel-button.screen-sharing-indicator StIcon { +@@ -2917,6 +2920,10 @@ StScrollBar { .login-dialog-message { text-align: center; } @@ -55,5 +85,5 @@ index 263ecd87f0..7ef7063367 100644 padding-top: 4em; padding-bottom: 8em; } -- -2.43.2 +2.45.1 diff --git a/0001-panel-Use-branding-in-activities-button.patch b/0001-panel-Use-branding-in-activities-button.patch new file mode 100644 index 0000000..7fcdf29 --- /dev/null +++ b/0001-panel-Use-branding-in-activities-button.patch @@ -0,0 +1,144 @@ +From b6a083225890bfd1ecf870ce051f12943cedf7e7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Wed, 22 May 2024 18:42:06 +0200 +Subject: [PATCH] panel: Use branding in activities button + +Replace the upstream workspace dots with a red hat. +--- + data/gnome-shell-icons.gresource.xml | 1 + + data/icons/scalable/actions/rh-logo.svg | 76 +++++++++++++++++++ + .../gnome-shell-sass/widgets/_panel.scss | 5 ++ + js/ui/panel.js | 6 +- + 4 files changed, 87 insertions(+), 1 deletion(-) + create mode 100644 data/icons/scalable/actions/rh-logo.svg + +diff --git a/data/gnome-shell-icons.gresource.xml b/data/gnome-shell-icons.gresource.xml +index db65673b41..e6c49ae343 100644 +--- a/data/gnome-shell-icons.gresource.xml ++++ b/data/gnome-shell-icons.gresource.xml +@@ -15,6 +15,7 @@ + scalable/actions/pointer-secondary-click-symbolic.svg + scalable/actions/preview-close-symbolic.svg + scalable/actions/record-screen-symbolic.svg ++ scalable/actions/rh-logo.svg + scalable/actions/screencast-recorded-symbolic.svg + scalable/actions/screencast-stop-symbolic.svg + scalable/actions/screenshooter-symbolic.svg +diff --git a/data/icons/scalable/actions/rh-logo.svg b/data/icons/scalable/actions/rh-logo.svg +new file mode 100644 +index 0000000000..e1330557c5 +--- /dev/null ++++ b/data/icons/scalable/actions/rh-logo.svg +@@ -0,0 +1,76 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ RedHat-Logo-Hat-Color ++ ++ ++ ++ ++ ++ ++ ++ RedHat-Logo-Hat-Color ++ ++ ++ ++ +diff --git a/data/theme/gnome-shell-sass/widgets/_panel.scss b/data/theme/gnome-shell-sass/widgets/_panel.scss +index 2a29eee9da..02f8232de6 100644 +--- a/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 + min-height: $scalable_icon_size * 0.5; + background-color: $panel_fg_color; + } ++ ++ & .activities-logo { ++ icon-size: $scalable_icon_size * 1.25; ++ padding: 0 $base_padding; ++ } + } + + // screen activity indicators +diff --git a/js/ui/panel.js b/js/ui/panel.js +index 62c8ebb31a..4fa094bd93 100644 +--- a/js/ui/panel.js ++++ b/js/ui/panel.js +@@ -425,7 +425,11 @@ class ActivitiesButton extends PanelMenu.Button { + accessible_name: _('Activities'), + }); + +- this.add_child(new WorkspaceIndicators()); ++ const logoIcon = new St.Icon({ ++ icon_name: 'rh-logo', ++ style_class: 'activities-logo', ++ }); ++ this.add_child(logoIcon); + + Main.overview.connectObject('showing', + () => this.add_style_pseudo_class('checked'), +-- +2.45.1 + diff --git a/gnome-shell.spec b/gnome-shell.spec index ec2280b..1d9ce0c 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -38,6 +38,7 @@ Patch: fix-fingerprint-failure-handling.patch Patch: 0001-extensionDownloader-Refuse-to-override-system-extens.patch # Misc. +Patch: 0001-panel-Use-branding-in-activities-button.patch Patch: 0001-app-Fall-back-to-window-title-instead-of-WM_CLASS.patch Patch: 0001-windowMenu-Bring-back-workspaces-submenu-for-static-.patch Patch: 0001-main-Dump-stack-on-segfaults-by-default.patch