Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Don't remove border from floating clients when exiting fullscreen

Conflicts:
	monsterwm.c
  • Loading branch information...
commit 3d03dcb26b30211c60b8851a106d957aed57b1ed 1 parent 5406b9d
@Cloudef authored c00kiemon5ter committed
Showing with 3 additions and 1 deletion.
  1. +3 −1 monsterwm.c
View
4 monsterwm.c
@@ -21,6 +21,7 @@
#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
#define BUTTONMASK ButtonPressMask|ButtonReleaseMask
#define ISFFT(c) (c->isfullscrn || c->isfloating || c->istransient)
+#define MDSK(c) monitors[c->monitor].desktops[monitors[c->monitor].current_desktop]
/* wrapper to automatically move/resize windows used by multi-monitor branch */
#define XMVRSZ(dis, win, x, y, w, h) XMoveResizeWindow(dis, win, wx + (x), wy + (y), w, h)
@@ -829,7 +830,8 @@ void setfullscreen(client *c, Bool fullscrn) {
netatoms[NET_WM_STATE], XA_ATOM, 32, PropModeReplace, (unsigned char*)
((c->isfullscrn = fullscrn) ? &netatoms[NET_FULLSCREEN]:0), fullscrn);
if (fullscrn) XMVRSZ(dis, c->win, 0, 0, ww, wh + PANEL_HEIGHT);
- XConfigureWindow(dis, c->win, CWBorderWidth, &(XWindowChanges){0,0,0,0,fullscrn?0:BORDER_WIDTH,0,0});
+ XConfigureWindow(dis, c->win, CWBorderWidth, &(XWindowChanges){0,0,0,0,
+ ((!fullscrn && MDSK(c).head && MDSK(c).head->next && MDSK(c).mode != MONOCLE) || c->isfloating)?BORDER_WIDTH:0,0,0});
}
/* set initial values
Please sign in to comment.
Something went wrong with that request. Please try again.