summary refs log tree commit diff
diff options
context:
space:
mode:
authorokan <okan>2017-02-10 15:00:54 +0000
committerokan <okan>2017-02-10 15:00:54 +0000
commitab8da6180277713fd99be23ceb341f5ce3a75522 (patch)
treebdc0fd77e7ccbcc260e3b24ef56b9b0726127c3d
parent48b465bcff72cfaca42f9b367b84df822b26bf39 (diff)
parent8d9d84d8592fb03c7a6cf7f68f61b1e84c3ac596 (diff)
downloadcwm-ab8da6180277713fd99be23ceb341f5ce3a75522.tar.gz
cwm-ab8da6180277713fd99be23ceb341f5ce3a75522.tar.xz
cwm-ab8da6180277713fd99be23ceb341f5ce3a75522.zip
cvsimport
* refs/heads/master:
  Fix group hidden state when a client wants to be on all desktops on start; reported by Vadim Vygonets with diff, but another approach was taken.
  Call client_resize instead of client_move after client_placecalc since the size may also change.
-rw-r--r--client.c2
-rw-r--r--group.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/client.c b/client.c
index 208c101..6f27b27 100644
--- a/client.c
+++ b/client.c
@@ -100,7 +100,7 @@ client_init(Window win, struct screen_ctx *sc, int active)
 
 	if (wattr.map_state != IsViewable) {
 		client_placecalc(cc);
-		client_move(cc);
+		client_resize(cc, 0);
 		if ((cc->wmh) && (cc->wmh->flags & StateHint))
 			client_set_wm_state(cc, cc->wmh->initial_state);
 	} else {
diff --git a/group.c b/group.c
index b585286..722afcb 100644
--- a/group.c
+++ b/group.c
@@ -164,7 +164,7 @@ group_movetogroup(struct client_ctx *cc, int idx)
 
 	if (cc->gc == gc)
 		return;
-	if (group_holds_only_hidden(gc))
+	if (gc->num != 0 && group_holds_only_hidden(gc))
 		client_hide(cc);
 	group_assign(gc, cc);
 }