Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

branch merge

  • Loading branch information...
commit a5b561c5f47e2d78899e77b9b02076719e1ec8ca 2 parents ea38010 + f4b0ff1
@garbeam garbeam authored
Showing with 7 additions and 6 deletions.
  1. +2 −2 config.def.h
  2. +5 −4 dwm.c
View
4 config.def.h
@@ -27,8 +27,8 @@ static Rule rules[] = {
};
/* layout(s) */
-static float mfact = 0.55;
-static Bool resizehints = False; /* False means respect size hints in tiled resizals */
+static float mfact = 0.55;
+static Bool resizehints = True; /* False means respect size hints in tiled resizals */
static Layout layouts[] = {
/* symbol arrange function */
View
9 dwm.c
@@ -913,7 +913,8 @@ manage(Window w, XWindowAttributes *wa) {
if(c->y + c->h + 2 * c->bw > sy + sh)
c->y = sy + sh - c->h - 2 * c->bw;
c->x = MAX(c->x, sx);
- c->y = MAX(c->y, by == 0 ? bh : sy);
+ /* only fix client y-offset, if the client center might cover the bar */
+ c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx) && (c->x + (c->w / 2) < wx + ww)) ? bh : sy);
c->bw = borderpx;
}
@@ -1093,11 +1094,11 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
w = MAX(w, c->minw);
h = MAX(h, c->minh);
-
- if (c->maxw)
+
+ if(c->maxw)
w = MIN(w, c->maxw);
- if (c->maxh)
+ if(c->maxh)
h = MIN(h, c->maxh);
}
if(w <= 0 || h <= 0)
Please sign in to comment.
Something went wrong with that request. Please try again.