e6414d8afc
Re-apply rebased and updated version of the RHEL 9 downstream patches, with some exceptions: Branding is still TBD, so has been left out for now. The desktop-icons extension will be replaced by an upstreamed version of desktop-icons-ng, which is still work-in-progress. Both dash-to-dock and dash-to-panel will be moved to separate packages, based on the existing Fedora package. It was decided to drop the panel-favorites and updates-dialog extensions. Resolves: RHEL-34255
58 lines
1.9 KiB
Diff
58 lines
1.9 KiB
Diff
From cadf2bb80984ec3b27b2d22ad65ec675230905c4 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
|
|
Date: Fri, 23 Feb 2024 01:59:15 +0100
|
|
Subject: [PATCH 04/28] workspace-indicator: Allow overriding base style class
|
|
|
|
This will allow reusing the code from the window-list extension
|
|
without limiting the ability to specify styling that only applies
|
|
to one of the extensions.
|
|
|
|
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/307>
|
|
---
|
|
.../workspace-indicator/workspaceIndicator.js | 13 ++++++++++---
|
|
1 file changed, 10 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/extensions/workspace-indicator/workspaceIndicator.js b/extensions/workspace-indicator/workspaceIndicator.js
|
|
index 4bf9c0a2..cdcc67fe 100644
|
|
--- a/extensions/workspace-indicator/workspaceIndicator.js
|
|
+++ b/extensions/workspace-indicator/workspaceIndicator.js
|
|
@@ -25,6 +25,8 @@ const TOOLTIP_ANIMATION_TIME = 150;
|
|
|
|
const MAX_THUMBNAILS = 6;
|
|
|
|
+let baseStyleClassName = '';
|
|
+
|
|
class WindowPreview extends St.Button {
|
|
static {
|
|
GObject.registerClass(this);
|
|
@@ -32,7 +34,7 @@ class WindowPreview extends St.Button {
|
|
|
|
constructor(window) {
|
|
super({
|
|
- style_class: 'workspace-indicator-window-preview',
|
|
+ style_class: `${baseStyleClassName}-window-preview`,
|
|
});
|
|
|
|
this._delegate = this;
|
|
@@ -256,10 +258,15 @@ export class WorkspaceIndicator extends PanelMenu.Button {
|
|
GObject.registerClass(this);
|
|
}
|
|
|
|
- constructor() {
|
|
+ constructor(params = {}) {
|
|
super(0.5, _('Workspace Indicator'));
|
|
|
|
- this.add_style_class_name('workspace-indicator');
|
|
+ const {
|
|
+ baseStyleClass = 'workspace-indicator',
|
|
+ } = params;
|
|
+
|
|
+ baseStyleClassName = baseStyleClass;
|
|
+ this.add_style_class_name(baseStyleClassName);
|
|
|
|
let container = new St.Widget({
|
|
layout_manager: new Clutter.BinLayout(),
|
|
--
|
|
2.44.0
|
|
|