git-gui: Don't delete scrollbars in console windows

If we have added a scrollbar to the console window because one
direction has too much text to fit in the available screen space
we should just keep the scrollbars.  Its annoying to watch our
horizontal scrollbar bounce in and out of the window as additional
text is inserted into the widget and the need for the scrollbar
comes and goes.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/lib/console.tcl b/lib/console.tcl
index c0e6fb3cc2fe9cb66e114d4998b2e91d65548980..2075374683a49dd8a955e52c76d951ec3013536b 100644 (file)
--- a/lib/console.tcl
+++ b/lib/console.tcl
@@ -202,14 +202,8 @@ method done {ok} {
 }
 
 method _sb_set {sb orient first last} {
-       if {$first == 0 && $last == 1} {
-               if {[winfo exists $sb]} {
-                       destroy $sb
-               }
-               return
-       }
-
        if {![winfo exists $sb]} {
+               if {$first == $last || ($first == 0 && $last == 1)} return
                if {$orient eq {h}} {
                        scrollbar $sb -orient h -command [list $w_t xview]
                        pack $sb -fill x -side bottom -before $w_t
@@ -218,7 +212,7 @@ method _sb_set {sb orient first last} {
                        pack $sb -fill y -side right -before $w_t
                }
        }
-       catch {$sb set $first $last}
+       $sb set $first $last
 }
 
 }