diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-29 20:04:24 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-29 20:04:24 +1000 |
commit | a2fbb20a616444213ff3967b33eed7f4561e3978 (patch) | |
tree | 276a133eb78d6e0655bc164693650454d43a22ca /sway/desktop/xdg_shell_v6.c | |
parent | Add comment about usage to arrange_windows declaration (diff) | |
parent | Merge pull request #2172 from apreiml/fix-keybinding-modifier-handling (diff) | |
download | sway-a2fbb20a616444213ff3967b33eed7f4561e3978.tar.gz sway-a2fbb20a616444213ff3967b33eed7f4561e3978.tar.zst sway-a2fbb20a616444213ff3967b33eed7f4561e3978.zip |
Merge remote-tracking branch 'upstream/master' into atomic
Diffstat (limited to 'sway/desktop/xdg_shell_v6.c')
-rw-r--r-- | sway/desktop/xdg_shell_v6.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index 7320e629..b296f1a8 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c | |||
@@ -117,11 +117,13 @@ static void set_fullscreen(struct sway_view *view, bool fullscreen) { | |||
117 | } | 117 | } |
118 | 118 | ||
119 | static bool wants_floating(struct sway_view *view) { | 119 | static bool wants_floating(struct sway_view *view) { |
120 | struct wlr_xdg_toplevel_v6_state *state = | 120 | struct wlr_xdg_toplevel_v6 *toplevel = |
121 | &view->wlr_xdg_surface_v6->toplevel->current; | 121 | view->wlr_xdg_surface_v6->toplevel; |
122 | return state->min_width != 0 && state->min_height != 0 | 122 | struct wlr_xdg_toplevel_v6_state *state = &toplevel->current; |
123 | return (state->min_width != 0 && state->min_height != 0 | ||
123 | && state->min_width == state->max_width | 124 | && state->min_width == state->max_width |
124 | && state->min_height == state->max_height; | 125 | && state->min_height == state->max_height) |
126 | || toplevel->parent; | ||
125 | } | 127 | } |
126 | 128 | ||
127 | static void for_each_surface(struct sway_view *view, | 129 | static void for_each_surface(struct sway_view *view, |