Merge remote-tracking branch 'upstream/master' into atomic

This commit is contained in:
Ryan Dwyer 2018-06-29 20:04:24 +10:00
commit a2fbb20a61
16 changed files with 193 additions and 74 deletions

View file

@ -117,11 +117,12 @@ static void set_fullscreen(struct sway_view *view, bool fullscreen) {
}
static bool wants_floating(struct sway_view *view) {
struct wlr_xdg_toplevel_state *state =
&view->wlr_xdg_surface->toplevel->current;
return state->min_width != 0 && state->min_height != 0
struct wlr_xdg_toplevel *toplevel = view->wlr_xdg_surface->toplevel;
struct wlr_xdg_toplevel_state *state = &toplevel->current;
return (state->min_width != 0 && state->min_height != 0
&& state->min_width == state->max_width
&& state->min_height == state->max_height;
&& state->min_height == state->max_height)
|| toplevel->parent;
}
static void for_each_surface(struct sway_view *view,