Revert change from 2010-03-30.

'shadow' must be set before 'show' is called, otherwise 'resize' uses the wrong width.
smerrill · Mar 20, 2011 · dfc28bc · dfc28bc
1 parent 19db952
commit dfc28bc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/scrollbar-rxvt.C b/src/scrollbar-rxvt.C
@@ -164,9 +164,8 @@ 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 (!term->option (Opt_scrollBar_floating))
+      if (shadow)
         {
-          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
@@ -194,6 +194,11 @@ 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;