Changeset 1865 for trunk/gui

Timestamp:

Aug 20, 2010, 7:49:45 AM (14 years ago)

Author:

mmc

Message:

Fixed the Scroller to favor keeping the scrollbar on screen, so we don't
get stuck in a mode where they disappear.

Fixed the Panes widget to do the layout with reqwidth instead of width.
When the widget first appears, the sashes have a width of 1 pixel, but
they immediately show up as 10 pixels, so the layout was off.

Location:

trunk/gui/scripts

Files:

• panes.tcl (modified) (2 diffs)
• scroller.tcl (modified) (1 diff)

trunk/gui/scripts/panes.tcl

@@ -325 +325 @@
                 lappend flist $f
                 if {[info exists itk_component($sash)]} {
-                    set h [expr {$h - [winfo height $itk_component($sash)]}]
+                    set h [expr {$h - [winfo reqheight $itk_component($sash)]}]
                 }
             } else {
@@ -373 +373 @@
                 lappend flist $f
                 if {[info exists itk_component($sash)]} {
-                    set w [expr {$w - [winfo width $itk_component($sash)]}]
+                    set w [expr {$w - [winfo reqwidth $itk_component($sash)]}]
                 }
             } else {

trunk/gui/scripts/scroller.tcl

@@ -267 +267 @@
         x {
             if {$state} {
-                if {![_lock active x]} {
-                    # grid $itk_component(xsbar) -row 1 -column 0 -sticky ew
-                    if {$col == 1} {
-                        grid $itk_component(xsbar) -row $row -column $col -sticky ew
-                    }
+                if {$col == 1} {
+                    grid $itk_component(xsbar) -row $row -column $col -sticky ew
                 }
             } else {
-                grid forget $itk_component(xsbar)
-                _lock set x
+                # handle the lock on the "forget" side, so scrollbar
+                # tends to appear, rather than disappear
+                if {![_lock active x]} {
+                    grid forget $itk_component(xsbar)
+                    _lock set x
+                }
             }
         }
         y {
             if {$state} {
-                if {![_lock active y]} {
-                    # grid $itk_component(ysbar) -row 0 -column 1 -sticky ns
-                    if {$row == 1} {
-                        grid $itk_component(ysbar) -row $row -column $col -sticky ns
-                    }
+                if {$row == 1} {
+                    grid $itk_component(ysbar) -row $row -column $col -sticky ns
                 }
             } else {
-                grid forget $itk_component(ysbar)
-                _lock set y
+                # handle the lock on the "forget" side, so scrollbar
+                # tends to appear, rather than disappear
+                if {![_lock active y]} {
+                    grid forget $itk_component(ysbar)
+                    _lock set y
+                }
             }
         }