mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-01-11 18:39:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: get right layout box for rendering views

Browse source
This commit is contained in:
Tony Crisci 2018-02-19 17:55:16 -05:00
parent 359bab38e2
commit b88f06e70a
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/desktop/output.c
View file

@ -51,7 +51,7 @@ static void render_surface(struct wlr_surface *surface,
// FIXME: view coords are inconsistently assumed to be in output or layout coords // FIXME: view coords are inconsistently assumed to be in output or layout coords
struct wlr_box layout_box = { struct wlr_box layout_box = {
.x = lx + owidth, .y = ly + oheight, .x = lx + wlr_output->lx, .y = ly + wlr_output->ly,
.width = render_width, .height = render_height, .width = render_width, .height = render_height,
}; };
if (wlr_output_layout_intersects(layout, wlr_output, &layout_box)) { if (wlr_output_layout_intersects(layout, wlr_output, &layout_box)) {

5
sway/tree/layout.c
View file

@ -531,7 +531,10 @@ static swayc_t *get_swayc_in_direction_under(swayc_t *container,
return wrap_candidate; return wrap_candidate;
} }
swayc_t *next = get_swayc_in_output_direction(adjacent, dir, seat); swayc_t *next = get_swayc_in_output_direction(adjacent, dir, seat);
if (next->children->length) { if (next == NULL) {
return NULL;
}
if (next->children && next->children->length) {
// TODO consider floating children as well // TODO consider floating children as well
return sway_seat_get_focus_inactive(seat, next); return sway_seat_get_focus_inactive(seat, next);
} else { } else {