use wlr_box for previous geom
This commit is contained in:
parent
5d9c9a9a68
commit
05a473335e
13
dwl.c
13
dwl.c
@ -101,7 +101,7 @@ typedef struct {
|
|||||||
struct wl_listener destroy;
|
struct wl_listener destroy;
|
||||||
struct wl_listener set_title;
|
struct wl_listener set_title;
|
||||||
struct wl_listener fullscreen;
|
struct wl_listener fullscreen;
|
||||||
struct wlr_box geom; /* layout-relative, includes border */
|
struct wlr_box geom, prev; /* layout-relative, includes border */
|
||||||
Monitor *mon;
|
Monitor *mon;
|
||||||
#ifdef XWAYLAND
|
#ifdef XWAYLAND
|
||||||
unsigned int type;
|
unsigned int type;
|
||||||
@ -112,10 +112,6 @@ typedef struct {
|
|||||||
unsigned int tags;
|
unsigned int tags;
|
||||||
int isfloating, isurgent;
|
int isfloating, isurgent;
|
||||||
uint32_t resize; /* configure serial of a pending resize */
|
uint32_t resize; /* configure serial of a pending resize */
|
||||||
int prevx;
|
|
||||||
int prevy;
|
|
||||||
int prevwidth;
|
|
||||||
int prevheight;
|
|
||||||
int isfullscreen;
|
int isfullscreen;
|
||||||
} Client;
|
} Client;
|
||||||
|
|
||||||
@ -1035,15 +1031,12 @@ setfullscreen(Client *c, int fullscreen)
|
|||||||
client_set_fullscreen(c, fullscreen);
|
client_set_fullscreen(c, fullscreen);
|
||||||
|
|
||||||
if (fullscreen) {
|
if (fullscreen) {
|
||||||
c->prevx = c->geom.x;
|
c->prev = c->geom;
|
||||||
c->prevy = c->geom.y;
|
|
||||||
c->prevheight = c->geom.height;
|
|
||||||
c->prevwidth = c->geom.width;
|
|
||||||
resize(c, c->mon->m.x, c->mon->m.y, c->mon->m.width, c->mon->m.height, 0);
|
resize(c, c->mon->m.x, c->mon->m.y, c->mon->m.width, c->mon->m.height, 0);
|
||||||
} else {
|
} else {
|
||||||
/* restore previous size instead of arrange for floating windows since
|
/* restore previous size instead of arrange for floating windows since
|
||||||
* client positions are set by the user and cannot be recalculated */
|
* client positions are set by the user and cannot be recalculated */
|
||||||
resize(c, c->prevx, c->prevy, c->prevwidth, c->prevheight, 0);
|
resize(c, c->prev.x, c->prev.y, c->prev.width, c->prev.height, 0);
|
||||||
arrange(c->mon);
|
arrange(c->mon);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user