mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-19 14:39:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2594 from RyanDwyer/fix-pinentry

Browse source 
Float views when min == max on either dimension
This commit is contained in:
emersion 2018-09-06 21:28:51 +02:00 committed by GitHub
parent ed9e7bb8f4 cf32d5d776
commit f3b96d4050
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/desktop/xdg_shell.c
View file

@ -170,8 +170,8 @@ static bool wants_floating(struct sway_view *view) {
struct wlr_xdg_toplevel *toplevel = view->wlr_xdg_surface->toplevel; struct wlr_xdg_toplevel *toplevel = view->wlr_xdg_surface->toplevel;
struct wlr_xdg_toplevel_state *state = &toplevel->current; struct wlr_xdg_toplevel_state *state = &toplevel->current;
return (state->min_width != 0 && state->min_height != 0 return (state->min_width != 0 && state->min_height != 0
&& state->min_width == state->max_width && (state->min_width == state->max_width
&& state->min_height == state->max_height) || state->min_height == state->max_height))
|| toplevel->parent; || toplevel->parent;
} }

4
sway/desktop/xdg_shell_v6.c
View file

@ -166,8 +166,8 @@ static bool wants_floating(struct sway_view *view) {
view->wlr_xdg_surface_v6->toplevel; view->wlr_xdg_surface_v6->toplevel;
struct wlr_xdg_toplevel_v6_state *state = &toplevel->current; struct wlr_xdg_toplevel_v6_state *state = &toplevel->current;
return (state->min_width != 0 && state->min_height != 0 return (state->min_width != 0 && state->min_height != 0
&& state->min_width == state->max_width && (state->min_width == state->max_width
&& state->min_height == state->max_height) || state->min_height == state->max_height))
|| toplevel->parent; || toplevel->parent;
} }

4
sway/desktop/xwayland.c
View file

@ -235,8 +235,8 @@ static bool wants_floating(struct sway_view *view) {
struct wlr_xwayland_surface_size_hints *size_hints = surface->size_hints; struct wlr_xwayland_surface_size_hints *size_hints = surface->size_hints;
if (size_hints != NULL && if (size_hints != NULL &&
size_hints->min_width != 0 && size_hints->min_height != 0 && size_hints->min_width != 0 && size_hints->min_height != 0 &&
size_hints->max_width == size_hints->min_width && (size_hints->max_width == size_hints->min_width ||
size_hints->max_height == size_hints->min_height) { size_hints->max_height == size_hints->min_height)) {
return true; return true;
} }