diff options
author | emersion <contact@emersion.fr> | 2018-01-22 01:16:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-22 01:16:23 +0100 |
commit | 0c58673c6a108ba241419a0f1d5fecd47f22370e (patch) | |
tree | c3e19af6dd70f04fc5c617e932b4afcc7a1b41d9 /sway/input/seat.c | |
parent | Remove sway/old/ (diff) | |
parent | dont allow kill command in config (diff) | |
download | sway-0c58673c6a108ba241419a0f1d5fecd47f22370e.tar.gz sway-0c58673c6a108ba241419a0f1d5fecd47f22370e.tar.zst sway-0c58673c6a108ba241419a0f1d5fecd47f22370e.zip |
Merge pull request #1574 from acrisci/config-refactor
Command criteria
Diffstat (limited to 'sway/input/seat.c')
-rw-r--r-- | sway/input/seat.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index 22fee3c3..e9b375e0 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -214,7 +214,7 @@ void sway_seat_set_focus(struct sway_seat *seat, swayc_t *container) { | |||
214 | 214 | ||
215 | if (container) { | 215 | if (container) { |
216 | struct sway_view *view = container->sway_view; | 216 | struct sway_view *view = container->sway_view; |
217 | view->iface.set_activated(view, true); | 217 | view_set_activated(view, true); |
218 | wl_signal_add(&container->events.destroy, &seat->focus_destroy); | 218 | wl_signal_add(&container->events.destroy, &seat->focus_destroy); |
219 | seat->focus_destroy.notify = handle_focus_destroy; | 219 | seat->focus_destroy.notify = handle_focus_destroy; |
220 | 220 | ||
@@ -234,8 +234,7 @@ void sway_seat_set_focus(struct sway_seat *seat, swayc_t *container) { | |||
234 | if (last_focus && | 234 | if (last_focus && |
235 | !sway_input_manager_has_focus(seat->input, last_focus)) { | 235 | !sway_input_manager_has_focus(seat->input, last_focus)) { |
236 | struct sway_view *view = last_focus->sway_view; | 236 | struct sway_view *view = last_focus->sway_view; |
237 | view->iface.set_activated(view, false); | 237 | view_set_activated(view, false); |
238 | |||
239 | } | 238 | } |
240 | } | 239 | } |
241 | 240 | ||