diff options
author | emersion <contact@emersion.fr> | 2018-09-22 13:40:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-22 13:40:01 +0200 |
commit | eae42606e2f6956013c0f68c090b4c0fbc3bee72 (patch) | |
tree | fe45308f88fd27a8412e47b0f187299d49250fbf /sway | |
parent | Merge pull request #2687 from ianyfan/swaybar (diff) | |
parent | Fix double iteration of scratchpad containers (diff) | |
download | sway-eae42606e2f6956013c0f68c090b4c0fbc3bee72.tar.gz sway-eae42606e2f6956013c0f68c090b4c0fbc3bee72.tar.zst sway-eae42606e2f6956013c0f68c090b4c0fbc3bee72.zip |
Merge pull request #2660 from RyanDwyer/fix-scratchpad-iteration
Fix double iteration of scratchpad containers
Diffstat (limited to 'sway')
-rw-r--r-- | sway/tree/root.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sway/tree/root.c b/sway/tree/root.c index ecc04ddb..d6f67bd7 100644 --- a/sway/tree/root.c +++ b/sway/tree/root.c | |||
@@ -265,10 +265,10 @@ void root_for_each_container(void (*f)(struct sway_container *con, void *data), | |||
265 | // Scratchpad | 265 | // Scratchpad |
266 | for (int i = 0; i < root->scratchpad->length; ++i) { | 266 | for (int i = 0; i < root->scratchpad->length; ++i) { |
267 | struct sway_container *container = root->scratchpad->items[i]; | 267 | struct sway_container *container = root->scratchpad->items[i]; |
268 | // If the container has a parent then it's visible on a workspace | 268 | // If the container has a workspace then it's visible on a workspace |
269 | // and will have been iterated in the previous for loop. So we only | 269 | // and will have been iterated in the previous for loop. So we only |
270 | // iterate the hidden scratchpad containers here. | 270 | // iterate the hidden scratchpad containers here. |
271 | if (!container->parent) { | 271 | if (!container->workspace) { |
272 | f(container, data); | 272 | f(container, data); |
273 | container_for_each_child(container, f, data); | 273 | container_for_each_child(container, f, data); |
274 | } | 274 | } |
@@ -311,7 +311,7 @@ struct sway_container *root_find_container( | |||
311 | // Scratchpad | 311 | // Scratchpad |
312 | for (int i = 0; i < root->scratchpad->length; ++i) { | 312 | for (int i = 0; i < root->scratchpad->length; ++i) { |
313 | struct sway_container *container = root->scratchpad->items[i]; | 313 | struct sway_container *container = root->scratchpad->items[i]; |
314 | if (!container->parent) { | 314 | if (!container->workspace) { |
315 | if (test(container, data)) { | 315 | if (test(container, data)) { |
316 | return container; | 316 | return container; |
317 | } | 317 | } |