Move 'shadow' initialization to 'show_rxvt'.

diff --git a/src/scrollbar-rxvt.C b/src/scrollbar-rxvt.C
index 4eb75398f86a65416616de3407db50695c90e4fc..3d55e8aa7345ed786d8cf374918271db7a2c972d 100644 (file)
--- a/src/scrollbar-rxvt.C
+++ b/src/scrollbar-rxvt.C
@@ -164,8 +164,9 @@ scrollBar_t::show_rxvt (int update)
       botShadowGC = XCreateGC (term->dpy, term->vt, GCForeground, &gcvalue);
       gcvalue.foreground = term->pix_colors[ (term->depth <= 2 ? Color_fg : Color_scroll)];
       scrollbarGC = XCreateGC (term->dpy, term->vt, GCForeground, &gcvalue);
-      if (shadow)
+      if (!term->option (Opt_scrollBar_floating))
         {
+          shadow = SHADOW_WIDTH;
           XSetWindowBackground (term->dpy, win, term->pix_colors_focused[Color_trough]);
           XClearWindow (term->dpy, win);
         }

diff --git a/src/scrollbar.C b/src/scrollbar.C
index 0dffa22fa4d7c4e557c2cc3708280aacdf762529..fa4d99ec4a796cb71a8628da01737182819d1101 100644 (file)
--- a/src/scrollbar.C
+++ b/src/scrollbar.C
@@ -194,11 +194,6 @@ scrollBar_t::setup (rxvt_term *term)
     if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
       width = min (i, SB_WIDTH_MAXIMUM);
 
-# ifdef RXVT_SCROLLBAR
-  if (! term->option (Opt_scrollBar_floating) && style == R_SB_RXVT)
-    shadow = SHADOW_WIDTH;
-# endif
-
   this->style = style;
   this->width = width;