summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2002-05-25 15:46:08 +0000
committerDana Jansens <danakj@orodu.net>2002-05-25 15:46:08 +0000
commit0c7e8e4011fad887d42320b269c638369eebcb5e (patch)
tree2e756c8d0870b177ead467e7d20cd45b69798d0e
parentc04cb76409820b3fa7543a49d21521907d1c9377 (diff)
fixed the geometry window not getting the proper pixmap. This was caused by using a style with the window.label.focus set to parentrelative. The window label's parent is the title bar but the geometry window's parent is root. The code now detects the parentrelative and tries to use the window.title as intended.
-rw-r--r--src/Screen.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index f793c91e..27b494af 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -206,6 +206,10 @@ BScreen::BScreen(Blackbox *bb, unsigned int scrn) : ScreenInfo(bb, scrn) {
BTexture* texture = &(resource.wstyle.l_focus);
geom_pixmap = texture->render(geom_w, geom_h, geom_pixmap);
+ if (geom_pixmap == ParentRelative) {
+ texture = &(resource.wstyle.t_focus);
+ geom_pixmap = texture->render(geom_w, geom_h, geom_pixmap);
+ }
if (! geom_pixmap)
XSetWindowBackground(blackbox->getXDisplay(), geom_window,
texture->color().pixel());
@@ -384,6 +388,10 @@ void BScreen::reconfigure(void) {
BTexture* texture = &(resource.wstyle.l_focus);
geom_pixmap = texture->render(geom_w, geom_h, geom_pixmap);
+ if (geom_pixmap == ParentRelative) {
+ texture = &(resource.wstyle.t_focus);
+ geom_pixmap = texture->render(geom_w, geom_h, geom_pixmap);
+ }
if (! geom_pixmap)
XSetWindowBackground(blackbox->getXDisplay(), geom_window,
texture->color().pixel());