do not allow set client size less than its min size
This commit is contained in:
parent
467123dc99
commit
475c134144
2 changed files with 24 additions and 2 deletions
20
client.h
20
client.h
|
@ -179,3 +179,23 @@ client_surface_at(Client *c, double cx, double cy, double *sx, double *sy)
|
||||||
#endif
|
#endif
|
||||||
return wlr_xdg_surface_surface_at(c->surface.xdg, cx, cy, sx, sy);
|
return wlr_xdg_surface_surface_at(c->surface.xdg, cx, cy, sx, sy);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline void
|
||||||
|
client_min_size(Client *c, int *width, int *height)
|
||||||
|
{
|
||||||
|
struct wlr_xdg_toplevel *toplevel;
|
||||||
|
struct wlr_xdg_toplevel_state *state;
|
||||||
|
#ifdef XWAYLAND
|
||||||
|
if (client_is_x11(c)) {
|
||||||
|
struct wlr_xwayland_surface_size_hints *size_hints;
|
||||||
|
size_hints = c->surface.xwayland->size_hints;
|
||||||
|
*width = size_hints->min_width;
|
||||||
|
*height = size_hints->min_height;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
toplevel = c->surface.xdg->toplevel;
|
||||||
|
state = &toplevel->current;
|
||||||
|
*width = state->min_width;
|
||||||
|
*height = state->min_height;
|
||||||
|
}
|
||||||
|
|
6
dwl.c
6
dwl.c
|
@ -1636,11 +1636,13 @@ rendermon(struct wl_listener *listener, void *data)
|
||||||
void
|
void
|
||||||
resize(Client *c, int x, int y, int w, int h, int interact)
|
resize(Client *c, int x, int y, int w, int h, int interact)
|
||||||
{
|
{
|
||||||
|
int min_width = 0, min_height = 0;
|
||||||
struct wlr_box *bbox = interact ? &sgeom : &c->mon->w;
|
struct wlr_box *bbox = interact ? &sgeom : &c->mon->w;
|
||||||
|
client_min_size(c, &min_width, &min_height);
|
||||||
c->geom.x = x;
|
c->geom.x = x;
|
||||||
c->geom.y = y;
|
c->geom.y = y;
|
||||||
c->geom.width = w;
|
c->geom.width = MAX(min_width + 2 * c->bw, w);
|
||||||
c->geom.height = h;
|
c->geom.height = MAX(min_height + 2 * c->bw, h);
|
||||||
applybounds(c, bbox);
|
applybounds(c, bbox);
|
||||||
|
|
||||||
/* Update scene-graph, including borders */
|
/* Update scene-graph, including borders */
|
||||||
|
|
Loading…
Reference in a new issue