diff options
author | Drew DeVault <sir@cmpwn.com> | 2015-12-01 18:05:37 -0500 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2015-12-01 18:05:37 -0500 |
commit | d098c620fe25c38cfab34b0685ea7ea10f72f2fd (patch) | |
tree | d84e3a1b7446f1ad88e7fa896c6af8995b14e622 | |
parent | Fix bug with for_window [...] move scratchpad (diff) | |
download | sway-d098c620fe25c38cfab34b0685ea7ea10f72f2fd.tar.gz sway-d098c620fe25c38cfab34b0685ea7ea10f72f2fd.tar.zst sway-d098c620fe25c38cfab34b0685ea7ea10f72f2fd.zip |
Revert "Fix bug with for_window [...] move scratchpad"
This reverts commit 0796b0c475bb46095d14a5291d62dd8e7d098262.
-rw-r--r-- | sway/focus.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sway/focus.c b/sway/focus.c index 0703ffb6..7af858a1 100644 --- a/sway/focus.c +++ b/sway/focus.c | |||
@@ -15,7 +15,6 @@ bool locked_view_focus = false; | |||
15 | static void update_focus(swayc_t *c) { | 15 | static void update_focus(swayc_t *c) { |
16 | // Handle if focus switches | 16 | // Handle if focus switches |
17 | swayc_t *parent = c->parent; | 17 | swayc_t *parent = c->parent; |
18 | if (!parent) return; | ||
19 | if (parent->focused != c) { | 18 | if (parent->focused != c) { |
20 | // Get previous focus | 19 | // Get previous focus |
21 | swayc_t *prev = parent->focused; | 20 | swayc_t *prev = parent->focused; |
@@ -88,7 +87,7 @@ swayc_t *get_focused_container(swayc_t *parent) { | |||
88 | } | 87 | } |
89 | 88 | ||
90 | bool set_focused_container(swayc_t *c) { | 89 | bool set_focused_container(swayc_t *c) { |
91 | if (locked_container_focus || !c || !c->visible || !c->parent) { | 90 | if (locked_container_focus || !c) { |
92 | return false; | 91 | return false; |
93 | } | 92 | } |
94 | swayc_log(L_DEBUG, c, "Setting focus to %p:%ld", c, c->handle); | 93 | swayc_log(L_DEBUG, c, "Setting focus to %p:%ld", c, c->handle); |