mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-24 17:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't try to resize a client smaller than its constraints

Browse source 
Many clients will not ack & commit configures that make them smaller
or larger than their specified constraints. This means that the
transaction will timeout and poor perceived performance will endure.
This commit is contained in:
Alexander Orzechowski 2022-02-21 20:02:28 -05:00
parent f7290007b2
commit 0c8737d1ef
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sway/desktop/xdg_shell.c
View file

@ -149,6 +149,13 @@ static bool configure(struct sway_view *view, uint32_t *serial,
return false; return false;
} }
// avoid same size configures as clients may not ack & commit them
struct wlr_xdg_toplevel *top = view->wlr_xdg_toplevel;
if ((int) top->pending.width == width &&
(int) top->pending.height == height) {
return false;
}
*serial = wlr_xdg_toplevel_set_size(top, width, height); *serial = wlr_xdg_toplevel_set_size(top, width, height);
return true; return true;
} }

9
sway/tree/view.c
View file

@ -1,6 +1,7 @@
#define _POSIX_C_SOURCE 200809L #define _POSIX_C_SOURCE 200809L
#include <stdlib.h> #include <stdlib.h>
#include <strings.h> #include <strings.h>
#include <math.h>
#include <wayland-server-core.h> #include <wayland-server-core.h>
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_buffer.h> #include <wlr/types/wlr_buffer.h>
@ -166,6 +167,14 @@ void view_get_constraints(struct sway_view *view, double *min_width,
bool view_configure(struct sway_view *view, uint32_t *serial, bool view_configure(struct sway_view *view, uint32_t *serial,
double lx, double ly, int width, int height) { double lx, double ly, int width, int height) {
// Many clients don't play nicely if you try to reconfigure them out of
// their specified constraints. Clamp the values.
double minw, maxw, minh, maxh;
view_get_constraints(view, &minw, &maxw, &minh, &maxh);
width = fmax(fmin(width, maxw), minw);
height = fmax(fmin(height, maxh), minh);
if (view->impl->configure) { if (view->impl->configure) {
return view->impl->configure(view, serial, lx, ly, width, height); return view->impl->configure(view, serial, lx, ly, width, height);
} }