From 6c7931a7a756e35db406a36c67cbea51630da570 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 27 2021 07:56:40 +0000 Subject: import gnome-shell-extensions-3.28.1-16.el7_9 --- diff --git a/SOURCES/0001-window-list-Leave-fake-overview-when-destroyed.patch b/SOURCES/0001-window-list-Leave-fake-overview-when-destroyed.patch new file mode 100644 index 0000000..d56e4dc --- /dev/null +++ b/SOURCES/0001-window-list-Leave-fake-overview-when-destroyed.patch @@ -0,0 +1,30 @@ +From bc7e558c61aa2ffe081ac741e48bdc393abeebde Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Tue, 26 Jan 2021 21:14:47 +0100 +Subject: [PATCH] window-list: Leave "fake overview" when destroyed + +Otherwise we leave an incomplete overview-like state around, which +can cause issues later when the extension is re-enabled (for example +when coming back from screen lock). + +https://bugzilla.redhat.com/show_bug.cgi?id=1904371 +--- + extensions/window-list/windowPicker.js | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/extensions/window-list/windowPicker.js b/extensions/window-list/windowPicker.js +index 4895ae5..9670d7a 100644 +--- a/extensions/window-list/windowPicker.js ++++ b/extensions/window-list/windowPicker.js +@@ -210,6 +210,8 @@ var WindowPicker = class { + } + + _onDestroy() { ++ this._fakeOverviewVisible(false); ++ + if (this._monitorsChangedId) + Main.layoutManager.disconnect(this._monitorsChangedId); + this._monitorsChangedId = 0; +-- +2.29.2 + diff --git a/SOURCES/add-workspace-tooltips.patch b/SOURCES/add-workspace-tooltips.patch new file mode 100644 index 0000000..5bc0857 --- /dev/null +++ b/SOURCES/add-workspace-tooltips.patch @@ -0,0 +1,176 @@ +From 2c270a5284e6df3571ea45161ca76d99f826fc80 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Wed, 20 Jan 2021 20:18:39 +0100 +Subject: [PATCH 1/2] workspace-indicator: Add tooltips to workspace thumbnails + +When showing previews instead of the menu, the workspace names from +our preferences don't appear anywhere. Some users care strongly about +those, so expose them as tooltip on hover. +--- + extensions/workspace-indicator/extension.js | 40 +++++++++++++++++++++ + 1 file changed, 40 insertions(+) + +diff --git a/extensions/workspace-indicator/extension.js b/extensions/workspace-indicator/extension.js +index 6b7947d..e403321 100644 +--- a/extensions/workspace-indicator/extension.js ++++ b/extensions/workspace-indicator/extension.js +@@ -11,6 +11,7 @@ const DND = imports.ui.dnd; + const PanelMenu = imports.ui.panelMenu; + const PopupMenu = imports.ui.popupMenu; + const Panel = imports.ui.panel; ++const Tweener = imports.ui.tweener; + + const Gettext = imports.gettext.domain('gnome-shell-extensions'); + const _ = Gettext.gettext; +@@ -24,6 +25,9 @@ const Convenience = Me.imports.convenience; + const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences'; + const WORKSPACE_KEY = 'workspace-names'; + ++const TOOLTIP_OFFSET = 6; ++const TOOLTIP_ANIMATION_TIME = 150; ++ + let WindowPreview = GObject.registerClass({ + GTypeName: 'WorkspaceIndicatorWindowPreview' + }, class WindowPreview extends St.Button { +@@ -127,7 +131,14 @@ let WorkspaceThumbnail = GObject.registerClass({ + y_fill: true + }); + ++ this._tooltip = new St.Label({ ++ style_class: 'dash-label', ++ visible: false, ++ }); ++ Main.uiGroup.add_child(this._tooltip); ++ + this.connect('destroy', this._onDestroy.bind(this)); ++ this.connect('notify::hover', this._syncTooltip.bind(this)); + + this._index = index; + this._delegate = this; // needed for DND +@@ -212,7 +223,36 @@ let WorkspaceThumbnail = GObject.registerClass({ + ws.activate(global.get_current_time()); + } + ++ _syncTooltip() { ++ if (this.hover) { ++ this._tooltip.text = Meta.prefs_get_workspace_name(this._index); ++ this._tooltip.opacity = 0; ++ this._tooltip.show(); ++ ++ const [stageX, stageY] = this.get_transformed_position(); ++ const thumbWidth = this.allocation.get_width(); ++ const thumbHeight = this.allocation.get_height(); ++ const tipWidth = this._tooltip.width; ++ const xOffset = Math.floor((thumbWidth - tipWidth) / 2); ++ const monitor = Main.layoutManager.findMonitorForActor(this); ++ const x = Math.min( ++ Math.max(stageX + xOffset, monitor.x), ++ monitor.x + monitor.width - tipWidth); ++ const y = stageY + thumbHeight + TOOLTIP_OFFSET; ++ this._tooltip.set_position(x, y); ++ } ++ ++ Tweener.addTween(this._tooltip, { ++ opacity: this.hover ? 255 : 0, ++ time: TOOLTIP_ANIMATION_TIME * 1000, ++ transition: 'easeOutQuad', ++ onComplete: () => (this._tooltip.visible = this.hover), ++ }); ++ } ++ + _onDestroy() { ++ this._tooltip.destroy(); ++ + this._workspace.disconnect(this._windowAddedId); + this._workspace.disconnect(this._windowRemovedId); + global.screen.disconnect(this._restackedId); +-- +2.29.2 + + +From 78dfd9ea361d348ea66724ade4e0a5a93546eada Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Wed, 20 Jan 2021 20:29:01 +0100 +Subject: [PATCH 2/2] window-list: Add tooltips to workspace thumbnails + +When showing previews instead of the menu, the workspace names +don't appear anywhere. Some users care strongly about those, so +expose them as tooltip on hover. +--- + extensions/window-list/workspaceIndicator.js | 40 ++++++++++++++++++++ + 1 file changed, 40 insertions(+) + +diff --git a/extensions/window-list/workspaceIndicator.js b/extensions/window-list/workspaceIndicator.js +index 527c201..a654aea 100644 +--- a/extensions/window-list/workspaceIndicator.js ++++ b/extensions/window-list/workspaceIndicator.js +@@ -5,10 +5,14 @@ const DND = imports.ui.dnd; + const Main = imports.ui.main; + const PanelMenu = imports.ui.panelMenu; + const PopupMenu = imports.ui.popupMenu; ++const Tweener = imports.ui.tweener; + + const Gettext = imports.gettext.domain('gnome-shell-extensions'); + const _ = Gettext.gettext; + ++const TOOLTIP_OFFSET = 6; ++const TOOLTIP_ANIMATION_TIME = 150; ++ + let WindowPreview = GObject.registerClass({ + GTypeName: 'WindowListWindowPreview' + }, class WindowPreview extends St.Button { +@@ -112,7 +116,14 @@ let WorkspaceThumbnail = GObject.registerClass({ + y_fill: true + }); + ++ this._tooltip = new St.Label({ ++ style_class: 'dash-label', ++ visible: false, ++ }); ++ Main.uiGroup.add_child(this._tooltip); ++ + this.connect('destroy', this._onDestroy.bind(this)); ++ this.connect('notify::hover', this._syncTooltip.bind(this)); + + this._index = index; + this._delegate = this; // needed for DND +@@ -197,7 +208,36 @@ let WorkspaceThumbnail = GObject.registerClass({ + ws.activate(global.get_current_time()); + } + ++ _syncTooltip() { ++ if (this.hover) { ++ this._tooltip.text = Meta.prefs_get_workspace_name(this._index); ++ this._tooltip.opacity = 0; ++ this._tooltip.show(); ++ ++ const [stageX, stageY] = this.get_transformed_position(); ++ const thumbWidth = this.allocation.get_width(); ++ const tipWidth = this._tooltip.width; ++ const tipHeight = this._tooltip.height; ++ const xOffset = Math.floor((thumbWidth - tipWidth) / 2); ++ const monitor = Main.layoutManager.findMonitorForActor(this); ++ const x = Math.min( ++ Math.max(stageX + xOffset, monitor.x), ++ monitor.x + monitor.width - tipWidth); ++ const y = stageY - tipHeight - TOOLTIP_OFFSET; ++ this._tooltip.set_position(x, y); ++ } ++ ++ Tweener.addTween(this._tooltip, { ++ opacity: this.hover ? 255 : 0, ++ time: TOOLTIP_ANIMATION_TIME * 1000, ++ transition: 'easeOutQuad', ++ onComplete: () => (this._tooltip.visible = this.hover), ++ }); ++ } ++ + _onDestroy() { ++ this._tooltip.destroy(); ++ + this._workspace.disconnect(this._windowAddedId); + this._workspace.disconnect(this._windowRemovedId); + global.screen.disconnect(this._restackedId); +-- +2.29.2 + diff --git a/SPECS/gnome-shell-extensions.spec b/SPECS/gnome-shell-extensions.spec index d63669d..204f4e1 100644 --- a/SPECS/gnome-shell-extensions.spec +++ b/SPECS/gnome-shell-extensions.spec @@ -6,7 +6,7 @@ Name: gnome-shell-extensions Version: 3.28.1 -Release: 14%{?dist} +Release: 16%{?dist} Summary: Modify and extend GNOME Shell functionality and behavior Group: User Interface/Desktops @@ -40,6 +40,8 @@ Patch15: 0001-window-list-workspace-indicator-Set-reactiveness-of-.patch Patch16: 0001-dashToDock-Handle-no-overview-case.patch Patch17: 0001-window-list-Invalid-current-mode-selected-in-Prefere.patch Patch18: top-icons-accel-name.patch +Patch19: add-workspace-tooltips.patch +Patch20: 0001-window-list-Leave-fake-overview-when-destroyed.patch Patch99: 0001-Revert-data-Remove-nautilus-classic.patch @@ -564,6 +566,14 @@ fi %changelog +* Tue Jan 26 2021 Florian Müllner - 3.28.1-16 +- Fix stuck window picker after screen lock + Resolves: #1904371 + +* Wed Jan 20 2021 Florian Müllner - 3.28.1-15 +- Add workspace tooltips to workspace-indicator/window-list + Resolves: #1901624 + * Wed Jun 17 2020 Florian Müllner - 3.28.1-14 - Fix workspace switch in window-list outside GNOME Classic Resolves: #1848058