From 15ec3581518d43532c0622fd7b116a6494122310 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 4 May 2007 16:14:16 +0000 Subject: [PATCH] group transients werent getting added to their parents --- openbox/client.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/openbox/client.c b/openbox/client.c index e9434217..cbc6d448 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -1657,32 +1657,32 @@ void client_update_wmhints(ObClient *self) self->group = NULL; } + /* add ourself to the group */ + if (hints->window_group != None) + self->group = group_add(hints->window_group, self); + + /* because the self->transient flag wont change from this call, we don't need to update the window's type and such, only its - transient_for, and the transients lists of other windows in - the group may be affected + transient_for do this before adding transients from the group so we know if we are actually transient for the group or not. */ client_update_transient_for(self); - if (hints->window_group != None) { - self->group = group_add(hints->window_group, self); - - /* i can only have transients from the group if i am not - transient for the group myself */ - if (self->transient_for != OB_TRAN_GROUP) { - /* add other transients of the group that are already - set up */ - for (it = self->group->members; it; - it = g_slist_next(it)) - { - ObClient *c = it->data; - if (c != self && c->transient_for == OB_TRAN_GROUP) - self->transients = - g_slist_append(self->transients, c); - } + /* i can only have transients from the group if i am not + transient for the group myself */ + if (self->group && (self->transient_for == NULL || + self->transient_for != OB_TRAN_GROUP)) + { + /* add other transients of the group that are already + set up */ + for (it = self->group->members; it; it = g_slist_next(it)) + { + ObClient *c = it->data; + if (c != self && c->transient_for == OB_TRAN_GROUP) + self->transients = g_slist_append(self->transients, c); } } } -- 2.45.2