From 1e25be8b1c06d39b207ad10667a47e0f02c907ea Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 3 Mar 2014 21:06:15 -0800 Subject: [PATCH] backport fixes for drag-and-drop workspace creation (BGO #724686) --- ...ils-Fix-creating-new-workspace-via-D.patch | 31 +++++++++++++++++ ...ils-Really-fix-DND-creating-new-work.patch | 33 +++++++++++++++++++ gnome-shell.spec | 11 ++++++- 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 0001-workspaceThumbnails-Fix-creating-new-workspace-via-D.patch create mode 100644 0008-workspaceThumbnails-Really-fix-DND-creating-new-work.patch diff --git a/0001-workspaceThumbnails-Fix-creating-new-workspace-via-D.patch b/0001-workspaceThumbnails-Fix-creating-new-workspace-via-D.patch new file mode 100644 index 0000000..5ea733f --- /dev/null +++ b/0001-workspaceThumbnails-Fix-creating-new-workspace-via-D.patch @@ -0,0 +1,31 @@ +From 89a2dc71fc1ed56702b0eac83b6d597cb946596f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Fri, 21 Feb 2014 10:38:29 +0100 +Subject: [PATCH 1/8] workspaceThumbnails: Fix creating new workspace via DND + +Commit 61a58ff3c981d4 replaced the (removed in commit 254afc50223a7) +MetaWindowActor.get_workspace() method by MetaWindow.get_workspace(), +but did not take into account that the return values differ - the +former returns the workspace index, the latter the workspace object. + +https://bugzilla.gnome.org/show_bug.cgi?id=724686 +--- + js/ui/workspaceThumbnail.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js +index 7b7bc90..913ed23 100644 +--- a/js/ui/workspaceThumbnail.js ++++ b/js/ui/workspaceThumbnail.js +@@ -822,7 +822,7 @@ const ThumbnailsBox = new Lang.Class({ + // ... move them down one. + windows.forEach(function(winActor) { + let window = winActor.meta_window; +- window.change_workspace_by_index(window.get_workspace() + 1, true); ++ window.change_workspace_by_index(window.get_workspace().index() + 1, true); + }); + + if (isWindow) +-- +1.9.0 + diff --git a/0008-workspaceThumbnails-Really-fix-DND-creating-new-work.patch b/0008-workspaceThumbnails-Really-fix-DND-creating-new-work.patch new file mode 100644 index 0000000..c311d2a --- /dev/null +++ b/0008-workspaceThumbnails-Really-fix-DND-creating-new-work.patch @@ -0,0 +1,33 @@ +From f4607626e40b97500f18bbe719952d4c58fef83a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Sun, 23 Feb 2014 00:10:50 +0100 +Subject: [PATCH 8/8] workspaceThumbnails: Really fix DND creating new + workspaces + +The same problem spotted in commit 89a2dc71fc1ed is present in +some more places, fix those as well. + +https://bugzilla.gnome.org/show_bug.cgi?id=724686 +--- + js/ui/workspaceThumbnail.js | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js +index 913ed23..25469e3 100644 +--- a/js/ui/workspaceThumbnail.js ++++ b/js/ui/workspaceThumbnail.js +@@ -812,9 +812,9 @@ const ThumbnailsBox = new Lang.Class({ + return false; + + if (isWindow) +- return window.get_workspace() >= newWorkspaceIndex && winActor != source; ++ return window.get_workspace().index() >= newWorkspaceIndex && winActor != source; + else +- return window.get_workspace() >= newWorkspaceIndex; ++ return window.get_workspace().index() >= newWorkspaceIndex; + }); + + this._spliceIndex = newWorkspaceIndex; +-- +1.9.0 + diff --git a/gnome-shell.spec b/gnome-shell.spec index 3f6d56c..a399f1e 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,6 +1,6 @@ Name: gnome-shell Version: 3.11.90 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Window management and application launching for GNOME Group: User Interface/Desktops @@ -19,6 +19,10 @@ Patch2: gnome-shell-3.11.90-background.patch # https://bugzilla.gnome.org/show_bug.cgi?id=724779 Patch3: gnome-shell-3.11.90-wifi_secrets.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=724686 +Patch4: 0001-workspaceThumbnails-Fix-creating-new-workspace-via-D.patch +Patch5: 0008-workspaceThumbnails-Really-fix-DND-creating-new-work.patch + %define clutter_version 1.13.4 %define gnome_bluetooth_version 1:3.9.0 %define gobject_introspection_version 0.10.1 @@ -124,6 +128,8 @@ easy to use experience. %patch1 -p1 -b .firefox %patch2 -p1 -b .background %patch3 -p1 -b .wifi_secrets +%patch4 -p1 -b .workspace_dnd1 +%patch5 -p1 -b .workspace_dnd2 %build (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi; @@ -183,6 +189,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null %exclude %{_datadir}/gtk-doc %changelog +* Mon Mar 03 2014 Adam Williamson - 3.11.90-5 +- backport fixes to fix drag-and-drop workspace creation (BGO #724686) + * Wed Feb 26 2014 Adam Williamson - 3.11.90-4 - backport a couple of bugfixes from BGO for things that annoy me