diff options
author | emersion <contact@emersion.fr> | 2018-04-02 15:30:58 -0400 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2018-04-02 15:30:58 -0400 |
commit | a4a241697ae591289d7c14eff972e1ef787216e2 (patch) | |
tree | d82d3c3eba2946670aa634a62d03feb7102f0bf8 /sway/tree/view.c | |
parent | Xwayland unmanaged views aren't views anymore (diff) | |
parent | Merge pull request #1699 from acrisci/seat-fixes (diff) | |
download | sway-a4a241697ae591289d7c14eff972e1ef787216e2.tar.gz sway-a4a241697ae591289d7c14eff972e1ef787216e2.tar.zst sway-a4a241697ae591289d7c14eff972e1ef787216e2.zip |
Merge branch 'wlroots' into view-redesign
Diffstat (limited to 'sway/tree/view.c')
-rw-r--r-- | sway/tree/view.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c index 8f044621..09c804e4 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c | |||
@@ -139,7 +139,7 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) { | |||
139 | } | 139 | } |
140 | 140 | ||
141 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 141 | struct sway_seat *seat = input_manager_current_seat(input_manager); |
142 | struct sway_container *focus = sway_seat_get_focus_inactive(seat, | 142 | struct sway_container *focus = seat_get_focus_inactive(seat, |
143 | &root_container); | 143 | &root_container); |
144 | struct sway_container *cont = container_view_create(focus, view); | 144 | struct sway_container *cont = container_view_create(focus, view); |
145 | 145 | ||
@@ -147,7 +147,7 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) { | |||
147 | view->swayc = cont; | 147 | view->swayc = cont; |
148 | 148 | ||
149 | arrange_windows(cont->parent, -1, -1); | 149 | arrange_windows(cont->parent, -1, -1); |
150 | sway_input_manager_set_focus(input_manager, cont); | 150 | input_manager_set_focus(input_manager, cont); |
151 | 151 | ||
152 | view_damage_whole(view); | 152 | view_damage_whole(view); |
153 | view_update_outputs(view, NULL); | 153 | view_update_outputs(view, NULL); |