Move 'shadow' initialization to 'show_rxvt'.

diff --git a/src/scrollbar-rxvt.C b/src/scrollbar-rxvt.C
index 4eb7539..3d55e8a 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);
       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);
         }
           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 0dffa22..fa4d99e 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);
 
     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;
 
   this->style = style;
   this->width = width;