diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-06-26 07:26:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-26 07:26:07 -0700 |
| commit | f0f50c31d5e40f3dbe80c60d01bafc80c3bd24c0 (patch) | |
| tree | 298f8a97f96710a88ed4e43957c5839594cacfd2 /sway/desktop/xdg_shell.c | |
| parent | 50ad949185aa57707fcd3f53c15cae193e8b6617 (diff) | |
| parent | ecd748d240f58961581b06272d85b5bd150b9a29 (diff) | |
Merge pull request #2162 from martinetd/float_xdg_shell
xdg_shell: make view floating if a parent has been set
Diffstat (limited to 'sway/desktop/xdg_shell.c')
| -rw-r--r-- | sway/desktop/xdg_shell.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c index d2b8822c..8457c06b 100644 --- a/sway/desktop/xdg_shell.c +++ b/sway/desktop/xdg_shell.c @@ -120,11 +120,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, |