diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec index a9b115c..5334d79 100644 --- a/gnome-shell-extensions.spec +++ b/gnome-shell-extensions.spec @@ -7,7 +7,7 @@ Name: gnome-shell-extensions Version: 40.7 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Modify and extend GNOME Shell functionality and behavior License: GPLv2+ @@ -468,6 +468,10 @@ workspaces. %changelog +* Fri Nov 15 2024 Florian Müllner - 40.7-21 +- Fix bug in window-list reordering backport + Resolves: RHEL-22692 + * Thu Sep 26 2024 Florian Müllner - 40.7-20 - Allow reordering items in window-list Resolves: RHEL-22692 diff --git a/window-list-reordering.patch b/window-list-reordering.patch index 17687c5..294d200 100644 --- a/window-list-reordering.patch +++ b/window-list-reordering.patch @@ -1,4 +1,4 @@ -From 8d134cdb3d2b43485c55463b34ac07bd6b98fda2 Mon Sep 17 00:00:00 2001 +From 60b46c8d82dfbdcfdf54d3f022318637870a3756 Mon Sep 17 00:00:00 2001 From: Jakub Steiner Date: Tue, 16 Jul 2024 09:40:53 +0200 Subject: [PATCH 01/24] window-list: Update styling @@ -288,7 +288,7 @@ index 017d844a..872c6afc 100644 2.47.0 -From a4c5998a98149633e480f9360fdb14f4f745dffb Mon Sep 17 00:00:00 2001 +From b36d05f6d827a9063fb35a5120207718a2f30af1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 25 Sep 2024 03:36:08 +0200 Subject: [PATCH 02/24] window-list: Small stylesheet cleanup @@ -332,7 +332,7 @@ index 088c9478..3a6ffd02 100644 2.47.0 -From 48d2c5e97563eaf7d7f190938b25d6dbac44f053 Mon Sep 17 00:00:00 2001 +From ad30fc0976bface7944beacc276c4ca85961f0d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 25 Jun 2024 19:24:35 +0200 Subject: [PATCH 03/24] window-list: Don't use homogeneous layout @@ -381,7 +381,7 @@ index 688ca761..a59307e2 100644 2.47.0 -From f048566e534bfdb2180cd8a41be8fe32b22d6e93 Mon Sep 17 00:00:00 2001 +From 987a526802bae4970cc41c7504f98b5ac568d62d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 18 Jun 2024 18:55:05 +0200 Subject: [PATCH 04/24] window-list: Don't hide window button while unmanaging @@ -430,7 +430,7 @@ index a59307e2..8ac59dd0 100644 2.47.0 -From 2606ddee95a7eea5c4c1aab024bf696a13e86845 Mon Sep 17 00:00:00 2001 +From 9d37d880dacb3a29c4976b5442128e7269048d0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 18 Jun 2024 18:59:38 +0200 Subject: [PATCH 05/24] window-list: Animate buttons in and out @@ -584,7 +584,7 @@ index 8ac59dd0..cb9e7160 100644 2.47.0 -From 03d90de7a681d53674f11a3118ae49b6162f268c Mon Sep 17 00:00:00 2001 +From 1f2213658f6d80ab7a9710dd5aa773499747efce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 18 Jun 2024 20:08:56 +0200 Subject: [PATCH 06/24] window-list: Replace custom tooltip implementation @@ -639,7 +639,7 @@ index cb9e7160..0dd3775e 100644 2.47.0 -From 576b45df3cadd3398d350ac060a858c1b4881fd8 Mon Sep 17 00:00:00 2001 +From 59d45cbef4ab701146325c46aea8bc6ffd13ca1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sat, 13 Jul 2024 00:11:19 +0200 Subject: [PATCH 07/24] window-list: Fix .focused styling @@ -676,7 +676,7 @@ index 0dd3775e..ec37f50f 100644 2.47.0 -From 44ea9aa790bd66e5d56c805b2d20117b64eaa46e Mon Sep 17 00:00:00 2001 +From 1c244245c09bc51247cb66786c0c303ad70a7c34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 25 Sep 2024 02:23:41 +0200 Subject: [PATCH 08/24] window-list: Split out AppTitle class @@ -785,7 +785,7 @@ index ec37f50f..9ced0940 100644 2.47.0 -From 9539d42745825d219d7a6059c505817734b55182 Mon Sep 17 00:00:00 2001 +From 04fe9d769db7ef66fb90d749b93a4e6aa1b6b2ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 25 Sep 2024 02:55:14 +0200 Subject: [PATCH 09/24] window-list: Simplify app button @@ -801,11 +801,11 @@ the same way. Part-of: --- - extensions/window-list/extension.js | 70 +++++++++++------------------ - 1 file changed, 25 insertions(+), 45 deletions(-) + extensions/window-list/extension.js | 69 ++++++++++------------------- + 1 file changed, 24 insertions(+), 45 deletions(-) diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js -index 9ced0940..468cd641 100644 +index 9ced0940..413e00ec 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -621,17 +621,6 @@ class AppButton extends BaseButton { @@ -838,7 +838,7 @@ index 9ced0940..468cd641 100644 this._windowsChangedId = this.app.connect( 'windows-changed', this._windowsChanged.bind(this)); this._windowsChanged(); -@@ -691,37 +675,33 @@ class AppButton extends BaseButton { +@@ -691,37 +675,32 @@ class AppButton extends BaseButton { } _windowsChanged() { @@ -893,8 +893,7 @@ index 9ced0940..468cd641 100644 + + this.label_actor = this._button.child.label_actor; + -+ this._contextMenu.connect( -+ 'open-state-changed', this._onMenuStateChanged.bind(this)); ++ this._contextMenu.connect('open-state-changed', _onMenuStateChanged); + Main.uiGroup.add_child(this._contextMenu.actor); + this._contextMenu.actor.hide(); + this._contextMenuManager.addMenu(this._contextMenu); @@ -905,7 +904,7 @@ index 9ced0940..468cd641 100644 2.47.0 -From 62440713ed43132f3f4c098fb857fe8f86fba89f Mon Sep 17 00:00:00 2001 +From 83ddccf1dfc4f04cc6be6cfe94fabed1cb78519a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Mon, 7 Oct 2024 17:22:04 +0200 Subject: [PATCH 10/24] window-list: Fix minimized styling @@ -924,7 +923,7 @@ Part-of: Date: Mon, 7 Oct 2024 17:10:43 +0200 Subject: [PATCH 11/24] window-list: Fix active state @@ -962,7 +961,7 @@ Part-of: Date: Tue, 15 Oct 2024 17:48:52 +0200 Subject: [PATCH 12/24] window-list: Remove outdated style @@ -1009,7 +1008,7 @@ index b9087971..f02fca60 100644 2.47.0 -From ab4e4d2aa6dcada7c22e3ce76844b080ff33b310 Mon Sep 17 00:00:00 2001 +From 543caf907e3bfe8e5b5c558e4b1bdda892e78caf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 26 Sep 2024 19:07:11 +0200 Subject: [PATCH 13/24] window-list: Split out some common code @@ -1021,10 +1020,10 @@ shared steps, move those to a shared `_addButton()` method. 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js -index 44917b6d..ef813f97 100644 +index c656a769..215dd15c 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js -@@ -1028,14 +1028,18 @@ class WindowList extends St.Widget { +@@ -1027,14 +1027,18 @@ class WindowList extends St.Widget { this._removeApp(app); } @@ -1045,7 +1044,7 @@ index 44917b6d..ef813f97 100644 _removeApp(app) { let children = this._windowList.get_children(); let child = children.find(c => c.app === app); -@@ -1056,11 +1060,8 @@ class WindowList extends St.Widget { +@@ -1055,11 +1059,8 @@ class WindowList extends St.Widget { this._windowSignals.set( win, win.connect('unmanaged', () => this._removeWindow(win))); @@ -1063,7 +1062,7 @@ index 44917b6d..ef813f97 100644 2.47.0 -From 014569ec46788789bda198fc3c7b70eaa245dc4c Mon Sep 17 00:00:00 2001 +From 6015e2021f157d5dc13ea20446d15be9f16a5717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 3 Oct 2024 17:19:31 +0200 Subject: [PATCH 14/24] window-list: Split out common TitleWidget class @@ -1075,7 +1074,7 @@ base class. 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js -index ef813f97..96f94312 100644 +index 215dd15c..1717d390 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -133,22 +133,35 @@ class WindowContextMenu extends PopupMenu.PopupMenu { @@ -1179,7 +1178,7 @@ index ef813f97..96f94312 100644 2.47.0 -From 8b24c06f6f1b0c4aecdfd4f2f5e320665cff94a2 Mon Sep 17 00:00:00 2001 +From 065d5175fdd69ee807aace784c4020f2a18c35b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 3 Oct 2024 17:27:57 +0200 Subject: [PATCH 15/24] window-list: Add TitleWidget:abstract-label property @@ -1194,7 +1193,7 @@ location, and the reduced style helps with that. 2 files changed, 28 insertions(+) diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js -index 96f94312..e03ab8d5 100644 +index 1717d390..31e69c6a 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -135,6 +135,12 @@ class WindowContextMenu extends PopupMenu.PopupMenu { @@ -1251,7 +1250,7 @@ index f02fca60..fce6bcc5 100644 2.47.0 -From 7fa8938371db1aba1e467a9923b502351378edf2 Mon Sep 17 00:00:00 2001 +From ff26402bcd0b3df00c61728bcb76103cc0855147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 25 Sep 2024 03:20:52 +0200 Subject: [PATCH 16/24] window-list: Split out `_createTitleActor()` hook @@ -1266,7 +1265,7 @@ the actual window list. 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js -index e03ab8d5..bb35b1a4 100644 +index 31e69c6a..075edb2d 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -418,6 +418,11 @@ const BaseButton = GObject.registerClass({ @@ -1315,8 +1314,8 @@ index e03ab8d5..bb35b1a4 100644 + this._button.child = this._createTitleActor(); this.label_actor = this._button.child.label_actor; - this._contextMenu.connect( -@@ -725,6 +733,15 @@ class AppButton extends BaseButton { + this._contextMenu.connect('open-state-changed', _onMenuStateChanged); +@@ -724,6 +732,15 @@ class AppButton extends BaseButton { this._contextMenuManager.addMenu(this._contextMenu); } @@ -1336,7 +1335,7 @@ index e03ab8d5..bb35b1a4 100644 2.47.0 -From 4ab013bb782f01991ccb78b0afc0b8442599d89f Mon Sep 17 00:00:00 2001 +From 69d981b29008b6143fcfadb4ed1bbca762179f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 19 Jun 2024 13:01:37 +0200 Subject: [PATCH 17/24] window-list: Rename XDND related methods and props @@ -1349,10 +1348,10 @@ it. 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js -index bb35b1a4..cd073234 100644 +index 075edb2d..c203453b 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js -@@ -914,11 +914,11 @@ class WindowList extends St.Widget { +@@ -913,11 +913,11 @@ class WindowList extends St.Widget { 'window-created', (dsp, win) => this._addWindow(win, true)); this._dragBeginId = Main.xdndHandler.connect('drag-begin', @@ -1368,7 +1367,7 @@ index bb35b1a4..cd073234 100644 }; this._dndTimeoutId = 0; -@@ -1119,16 +1119,16 @@ class WindowList extends St.Widget { +@@ -1118,16 +1118,16 @@ class WindowList extends St.Widget { child?.animateOutAndDestroy(); } @@ -1390,7 +1389,7 @@ index bb35b1a4..cd073234 100644 if (Main.overview.visible || !this.contains(dragEvent.targetActor)) { this._removeActivateTimeout(); -@@ -1197,7 +1197,7 @@ class WindowList extends St.Widget { +@@ -1196,7 +1196,7 @@ class WindowList extends St.Widget { global.display.disconnect(this._fullscreenChangedId); global.display.disconnect(this._windowCreatedId); @@ -1403,7 +1402,7 @@ index bb35b1a4..cd073234 100644 2.47.0 -From 260c2487e77ee819751d52c1d2a835babe2958c9 Mon Sep 17 00:00:00 2001 +From 00a9446d601d8968a059c8e632b74a7253ceea5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 25 Sep 2024 04:13:25 +0200 Subject: [PATCH 18/24] window-list: Allow rearranging window buttons @@ -1436,7 +1435,7 @@ index 3a6ffd02..74945657 100644 + border-color: #888; +} diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js -index cd073234..a47ba07a 100644 +index c203453b..b4c027fd 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -18,6 +18,8 @@ const _ = Gettext.gettext; @@ -1527,7 +1526,7 @@ index cd073234..a47ba07a 100644 _createTitleActor() { throw new GObject.NotImplementedError( `_createTitleActor in ${this.constructor.name}`); -@@ -921,9 +967,19 @@ class WindowList extends St.Widget { +@@ -920,9 +966,19 @@ class WindowList extends St.Widget { dragMotion: this._onXdndDragMotion.bind(this), }; @@ -1547,7 +1546,7 @@ index cd073234..a47ba07a 100644 this._settings = ExtensionUtils.getSettings(); this._settings.connect('changed::grouping-mode', () => this._groupingModeChanged()); -@@ -1069,6 +1125,14 @@ class WindowList extends St.Widget { +@@ -1068,6 +1124,14 @@ class WindowList extends St.Widget { _addButton(button, animate) { this._settings.bind('display-all-workspaces', button, 'ignore-workspace', Gio.SettingsBindFlags.GET); @@ -1562,7 +1561,7 @@ index cd073234..a47ba07a 100644 this._windowList.add_child(button); button.show(animate); } -@@ -1119,6 +1183,82 @@ class WindowList extends St.Widget { +@@ -1118,6 +1182,82 @@ class WindowList extends St.Widget { child?.animateOutAndDestroy(); } @@ -1684,7 +1683,7 @@ index fce6bcc5..c92081d2 100644 2.47.0 -From f56f84b6c22c5ce11a1a5a99db7c6a4b56f3ddce Mon Sep 17 00:00:00 2001 +From 99d4e460e634c567bd920a73e6d781bfae73e63d Mon Sep 17 00:00:00 2001 From: Jakub Steiner Date: Thu, 3 Oct 2024 14:18:32 +0200 Subject: [PATCH 19/24] window-list: Indicate drop target more prominently @@ -1737,7 +1736,7 @@ index c92081d2..4c06ebc0 100644 2.47.0 -From 1fd9fc35ec64e44524368da26356749b769e69eb Mon Sep 17 00:00:00 2001 +From a4f268ef85d14e4b4477140c3a6238c97c89efd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 3 Oct 2024 17:05:42 +0200 Subject: [PATCH 20/24] window-list: Fade out drag source during drag @@ -1749,7 +1748,7 @@ item, not to identify it or its origin. 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js -index a47ba07a..bd1fc36a 100644 +index b4c027fd..7a7cecf0 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -20,6 +20,9 @@ const DND_ACTIVATE_TIMEOUT = 500; @@ -1762,7 +1761,7 @@ index a47ba07a..bd1fc36a 100644 const GroupingMode = { NEVER: 0, AUTO: 1, -@@ -1126,9 +1129,20 @@ class WindowList extends St.Widget { +@@ -1125,9 +1128,20 @@ class WindowList extends St.Widget { this._settings.bind('display-all-workspaces', button, 'ignore-workspace', Gio.SettingsBindFlags.GET); @@ -1789,7 +1788,7 @@ index a47ba07a..bd1fc36a 100644 2.47.0 -From c23e617112883e5589a18a96eadbe00ba940f79e Mon Sep 17 00:00:00 2001 +From 37be1408c88d7fa91d833df714a9a7f0a3039670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 9 Oct 2024 19:15:16 +0200 Subject: [PATCH 21/24] window-list: Shrink drag-actor size during drags @@ -1801,7 +1800,7 @@ the target location instead of the dragged item. 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js -index bd1fc36a..ac17e051 100644 +index 7a7cecf0..d56eb38c 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -23,6 +23,8 @@ const MIN_DRAG_UPDATE_INTERVAL = 500 * GLib.TIME_SPAN_MILLISECOND; @@ -1868,7 +1867,7 @@ index bd1fc36a..ac17e051 100644 2.47.0 -From a02a7c398d11586f379d1ac78695c37a4c1976e0 Mon Sep 17 00:00:00 2001 +From 30857e997ccbe9dddc4d43a929f80e2121246cf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 8 Oct 2024 19:25:53 +0200 Subject: [PATCH 22/24] window-list: Handle DND events near the drop target @@ -1881,7 +1880,7 @@ DND events near drop targets as if they occurred on the target. 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js -index ac17e051..f3fc0d21 100644 +index d56eb38c..5046d415 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -25,6 +25,8 @@ const DRAG_FADE_DURATION = 200; @@ -1893,7 +1892,7 @@ index ac17e051..f3fc0d21 100644 const GroupingMode = { NEVER: 0, AUTO: 1, -@@ -1000,6 +1002,7 @@ class WindowList extends St.Widget { +@@ -999,6 +1001,7 @@ class WindowList extends St.Widget { this._itemDragMonitor = { dragMotion: this._onItemDragMotion.bind(this), @@ -1901,7 +1900,7 @@ index ac17e051..f3fc0d21 100644 }; this._dndTimeoutId = 0; -@@ -1296,11 +1299,30 @@ class WindowList extends St.Widget { +@@ -1295,11 +1298,30 @@ class WindowList extends St.Widget { } _onItemDragMotion(dragEvent) { @@ -1938,7 +1937,7 @@ index ac17e051..f3fc0d21 100644 2.47.0 -From dd64e5d972246fbfeaf24dec8a6997242b465982 Mon Sep 17 00:00:00 2001 +From 36bf2c49de46907e3f9a5804fe925a42f4fca806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 26 Jun 2024 00:58:18 +0200 Subject: [PATCH 23/24] window-list: Add `id` property to buttons @@ -1950,7 +1949,7 @@ serialize/deserialize the positions in the next commit. 1 file changed, 8 insertions(+) diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js -index f3fc0d21..2b2c092c 100644 +index 5046d415..c945d380 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -608,6 +608,10 @@ class WindowButton extends BaseButton { @@ -1979,7 +1978,7 @@ index f3fc0d21..2b2c092c 100644 2.47.0 -From 89e8ead8eeee6807e917e9252c310dfff58a1c01 Mon Sep 17 00:00:00 2001 +From 501d72e4d9d52e40a97184da5417879d24515173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 24 Sep 2024 20:31:06 +0200 Subject: [PATCH 24/24] window-list: Save and restore positions as runtime @@ -1998,7 +1997,7 @@ and restore them when populating the list. 1 file changed, 28 insertions(+) diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js -index 2b2c092c..814f714e 100644 +index c945d380..83262e1c 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -27,6 +27,8 @@ const DRAG_RESIZE_DURATION = 400; @@ -2010,7 +2009,7 @@ index 2b2c092c..814f714e 100644 const GroupingMode = { NEVER: 0, AUTO: 1, -@@ -1147,6 +1149,8 @@ class WindowList extends St.Widget { +@@ -1146,6 +1148,8 @@ class WindowList extends St.Widget { for (let i = 0; i < apps.length; i++) this._addApp(apps[i], false); } @@ -2019,7 +2018,7 @@ index 2b2c092c..814f714e 100644 } _updateKeyboardAnchor() { -@@ -1295,9 +1299,33 @@ class WindowList extends St.Widget { +@@ -1294,9 +1298,33 @@ class WindowList extends St.Widget { this._clearDragPlaceholder();