This repository has been archived by the owner on May 20, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 252
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
upgpkg: chromium 97.0.4692.71-2: fix tab dragging (FS#73307)
git-svn-id: file:///srv/repos/svn-packages/svn@434008 eb2447ed-0c53-47e4-bac8-5bc4a241df78
- Loading branch information
foutrelis
authored and
svntogit
committed
Jan 9, 2022
1 parent
dc92e33
commit e2ef1df
Showing
3 changed files
with
90 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| From 52d0ad25ea695da44195e49f36e69fa81b55e670 Mon Sep 17 00:00:00 2001 | ||
| From: Tom Anderson <thomasanderson@chromium.org> | ||
| Date: Wed, 5 Jan 2022 21:11:03 +0000 | ||
| Subject: [PATCH] [X11] Fix tag dragging in KWin | ||
|
|
||
| R=sky | ||
|
|
||
| Bug: 1279532 | ||
| Change-Id: Iac166803e2149eef234045d922b630f0019c8073 | ||
| Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3355376 | ||
| Auto-Submit: Thomas Anderson <thomasanderson@chromium.org> | ||
| Reviewed-by: Scott Violet <sky@chromium.org> | ||
| Commit-Queue: Thomas Anderson <thomasanderson@chromium.org> | ||
| Cr-Commit-Position: refs/heads/main@{#955869} | ||
| --- | ||
| ui/platform_window/x11/x11_topmost_window_finder.cc | 6 +++--- | ||
| 1 file changed, 3 insertions(+), 3 deletions(-) | ||
|
|
||
| diff --git a/ui/platform_window/x11/x11_topmost_window_finder.cc b/ui/platform_window/x11/x11_topmost_window_finder.cc | ||
| index 50e75e17f0a..2e16393487b 100644 | ||
| --- a/ui/platform_window/x11/x11_topmost_window_finder.cc | ||
| +++ b/ui/platform_window/x11/x11_topmost_window_finder.cc | ||
| @@ -68,9 +68,9 @@ bool EnumerateAllWindows(ShouldStopIteratingCallback should_stop_iterating, | ||
|
|
||
| void EnumerateTopLevelWindows( | ||
| ui::ShouldStopIteratingCallback should_stop_iterating) { | ||
| - // Some WMs parent 'top-level' windows in unnamed actual top-level windows | ||
| - // (ion WM), so extend the search depth to all children of top-level windows. | ||
| - const int kMaxSearchDepth = 1; | ||
| + // WMs may reparent toplevel windows inside their own containers, so extend | ||
| + // the search to all grandchildren of all toplevel windows. | ||
| + const int kMaxSearchDepth = 2; | ||
| ui::EnumerateAllWindows(should_stop_iterating, kMaxSearchDepth); | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| From 3806f28918ea23291749ff4775339075a5f394e8 Mon Sep 17 00:00:00 2001 | ||
| From: Tom Anderson <thomasanderson@chromium.org> | ||
| Date: Thu, 6 Jan 2022 00:59:40 +0000 | ||
| Subject: [PATCH] [X11] Fix tag dragging in Mutter | ||
|
|
||
| We used to use a BFS to find the target window for tag dragging, but | ||
| this causes windows underneath (like the window for the desktop | ||
| wallpaper) to take precedence over nested windows. | ||
|
|
||
| This CL switches to a DFS. | ||
|
|
||
| R=sky | ||
|
|
||
| Bug: 1279532 | ||
| Change-Id: Ib569e9270be60bcb4fff088517dfe295697608b0 | ||
| Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3355470 | ||
| Reviewed-by: Scott Violet <sky@chromium.org> | ||
| Commit-Queue: Thomas Anderson <thomasanderson@chromium.org> | ||
| Auto-Submit: Thomas Anderson <thomasanderson@chromium.org> | ||
| Cr-Commit-Position: refs/heads/main@{#955976} | ||
| --- | ||
| ui/platform_window/x11/x11_topmost_window_finder.cc | 11 ++--------- | ||
| 1 file changed, 2 insertions(+), 9 deletions(-) | ||
|
|
||
| diff --git a/ui/platform_window/x11/x11_topmost_window_finder.cc b/ui/platform_window/x11/x11_topmost_window_finder.cc | ||
| index 2e16393487b..e20bf0abf0e 100644 | ||
| --- a/ui/platform_window/x11/x11_topmost_window_finder.cc | ||
| +++ b/ui/platform_window/x11/x11_topmost_window_finder.cc | ||
| @@ -44,15 +44,8 @@ bool EnumerateChildren(ShouldStopIteratingCallback should_stop_iterating, | ||
| for (iter = windows.rbegin(); iter != windows.rend(); iter++) { | ||
| if (IsWindowNamed(*iter) && should_stop_iterating.Run(*iter)) | ||
| return true; | ||
| - } | ||
| - | ||
| - // If we're at this point, we didn't find the window we're looking for at the | ||
| - // current level, so we need to recurse to the next level. We use a second | ||
| - // loop because the recursion and call to XQueryTree are expensive and is only | ||
| - // needed for a small number of cases. | ||
| - if (++depth <= max_depth) { | ||
| - for (iter = windows.rbegin(); iter != windows.rend(); iter++) { | ||
| - if (EnumerateChildren(should_stop_iterating, *iter, max_depth, depth)) | ||
| + if (depth < max_depth) { | ||
| + if (EnumerateChildren(should_stop_iterating, *iter, max_depth, depth + 1)) | ||
| return true; | ||
| } | ||
| } |