summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@tycho.nsa.gov>2011-07-26 20:57:14 -0400
committerEamon Walsh <ewalsh@tycho.nsa.gov>2011-07-26 20:57:14 -0400
commit8e918a6ef68665a9d5ab18abaef86374ea255f8a (patch)
tree5353dedc6f9cd05efa5e2694b3ce49e377145976
parent74c1151600649203e5f848b565cf6d96d7028101 (diff)
Fix VIEW_STACK_BOTTOM stacking to still stack above the background view.
-rw-r--r--src/dclient.c1
-rw-r--r--src/display.c4
-rw-r--r--src/sclient.c1
-rw-r--r--src/view.c2
4 files changed, 6 insertions, 2 deletions
diff --git a/src/dclient.c b/src/dclient.c
index 374a8a4..20f4aa3 100644
--- a/src/dclient.c
+++ b/src/dclient.c
@@ -161,6 +161,7 @@ dclient_setup(void)
return -1;
}
+ sd.bg_view = b->bg_view;
return 0;
}
diff --git a/src/display.c b/src/display.c
index 86fd6f8..5b1be67 100644
--- a/src/display.c
+++ b/src/display.c
@@ -386,7 +386,7 @@ display_view_stack(struct view *v, unsigned op, struct view *sibling)
t->window->RaiseToTop(t->window);
break;
case VIEW_STACK_BOTTOM:
- t->window->LowerToBottom(t->window);
+ t->window->PutAtop(t->window, v->display->bg_view->thumb->window);
break;
case VIEW_STACK_ABOVE:
t->window->PutAtop(t->window, sibling->thumb->window);
@@ -395,6 +395,8 @@ display_view_stack(struct view *v, unsigned op, struct view *sibling)
t->window->PutBelow(t->window, sibling->thumb->window);
break;
}
+
+ return 0;
}
void
diff --git a/src/sclient.c b/src/sclient.c
index fcbce5a..20402f5 100644
--- a/src/sclient.c
+++ b/src/sclient.c
@@ -126,6 +126,7 @@ sclient_setup(void)
return -1;
}
+ sd.bg_view = b->bg_view;
return 0;
}
diff --git a/src/view.c b/src/view.c
index 0b06e3e..3fa8b16 100644
--- a/src/view.c
+++ b/src/view.c
@@ -382,7 +382,7 @@ view_stack(struct view *v, unsigned op, struct view *sibling)
goto out;
TAILQ_REMOVE(&d->views, v, display_next);
TAILQ_INSERT_TAIL(&d->views, v, display_next);
- v->window->LowerToBottom(v->window);
+ v->window->PutAtop(v->window, v->display->bg_view->window);
break;
case VIEW_STACK_ABOVE:
if (TAILQ_FIRST(&d->views) == v)