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 | |
parent | Merge pull request #2164 from ael-code/background_fixes (diff) | |
parent | Merge branch 'master' into float_xdg_shell (diff) | |
download | sway-f0f50c31d5e40f3dbe80c60d01bafc80c3bd24c0.tar.gz sway-f0f50c31d5e40f3dbe80c60d01bafc80c3bd24c0.tar.zst sway-f0f50c31d5e40f3dbe80c60d01bafc80c3bd24c0.zip |
Merge pull request #2162 from martinetd/float_xdg_shell
xdg_shell: make view floating if a parent has been set
-rw-r--r-- | sway/desktop/xdg_shell.c | 9 | ||||
-rw-r--r-- | sway/desktop/xdg_shell_v6.c | 10 |
2 files changed, 11 insertions, 8 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) { | |||
120 | } | 120 | } |
121 | 121 | ||
122 | static bool wants_floating(struct sway_view *view) { | 122 | static bool wants_floating(struct sway_view *view) { |
123 | struct wlr_xdg_toplevel_state *state = | 123 | struct wlr_xdg_toplevel *toplevel = view->wlr_xdg_surface->toplevel; |
124 | &view->wlr_xdg_surface->toplevel->current; | 124 | struct wlr_xdg_toplevel_state *state = &toplevel->current; |
125 | return state->min_width != 0 && state->min_height != 0 | 125 | return (state->min_width != 0 && state->min_height != 0 |
126 | && state->min_width == state->max_width | 126 | && state->min_width == state->max_width |
127 | && state->min_height == state->max_height; | 127 | && state->min_height == state->max_height) |
128 | || toplevel->parent; | ||
128 | } | 129 | } |
129 | 130 | ||
130 | static void for_each_surface(struct sway_view *view, | 131 | static void for_each_surface(struct sway_view *view, |
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index 6ffe334a..eb1cef26 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c | |||
@@ -119,11 +119,13 @@ static void set_fullscreen(struct sway_view *view, bool fullscreen) { | |||
119 | } | 119 | } |
120 | 120 | ||
121 | static bool wants_floating(struct sway_view *view) { | 121 | static bool wants_floating(struct sway_view *view) { |
122 | struct wlr_xdg_toplevel_v6_state *state = | 122 | struct wlr_xdg_toplevel_v6 *toplevel = |
123 | &view->wlr_xdg_surface_v6->toplevel->current; | 123 | view->wlr_xdg_surface_v6->toplevel; |
124 | return state->min_width != 0 && state->min_height != 0 | 124 | struct wlr_xdg_toplevel_v6_state *state = &toplevel->current; |
125 | return (state->min_width != 0 && state->min_height != 0 | ||
125 | && state->min_width == state->max_width | 126 | && state->min_width == state->max_width |
126 | && state->min_height == state->max_height; | 127 | && state->min_height == state->max_height) |
128 | || toplevel->parent; | ||
127 | } | 129 | } |
128 | 130 | ||
129 | static void for_each_surface(struct sway_view *view, | 131 | static void for_each_surface(struct sway_view *view, |