From: Dana Jansens <danakj@orodu.net>
Date: Sat, 25 May 2002 15:46:08 +0000 (+0000)
Subject: fixed the geometry window not getting the proper pixmap.  This was caused by using... 
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=0c7e8e4011fad887d42320b269c638369eebcb5e;p=chaz%2Fopenbox

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.
---

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());