nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

only add non-nonintrusively when both windows share a stacking layer

Browse source
This commit is contained in:
Dana Jansens 2003-05-29 15:24:56 +00:00
parent 6ddb059783
commit 3424de66b2
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
openbox/stacking.c
View file

@ -110,6 +110,8 @@ void stacking_raise(ObWindow *window)
{ {
g_assert(stacking_list != NULL); /* this would be bad */ g_assert(stacking_list != NULL); /* this would be bad */
g_message("RAISING");
if (WINDOW_IS_CLIENT(window)) { if (WINDOW_IS_CLIENT(window)) {
Client *client = WINDOW_AS_CLIENT(window); Client *client = WINDOW_AS_CLIENT(window);
@ -243,23 +245,25 @@ void stacking_add_nonintrusive(ObWindow *win)
if (!(it_before = g_list_find(stacking_list, parent))) { if (!(it_before = g_list_find(stacking_list, parent))) {
/* no parent to put above, try find the focused client to go /* no parent to put above, try find the focused client to go
under */ under */
if ((it_before = g_list_find(stacking_list, focus_client))) if (focus_client && focus_client->layer == client->layer) {
it_before = it_before->next; if ((it_before = g_list_find(stacking_list, focus_client)))
else { it_before = it_before->next;
/* out of ideas, just add it normally... */
stacking_add(win);
return;
} }
} }
stacking_list = g_list_insert_before(stacking_list, it_before, win); if (!it_before) {
/* out of ideas, just add it normally... */
stacking_add(win);
} else {
stacking_list = g_list_insert_before(stacking_list, it_before,win);
it_before = g_list_find(stacking_list, win)->prev; it_before = g_list_find(stacking_list, win)->prev;
if (!it_before) if (!it_before)
wins[0] = focus_backup; wins[0] = focus_backup;
else else
wins[0] = window_top(it_before->data); wins[0] = window_top(it_before->data);
wins[1] = window_top(win); wins[1] = window_top(win);
XRestackWindows(ob_display, wins, 2); XRestackWindows(ob_display, wins, 2);
}
} }
} }