Changeset 1852

Timestamp:

Aug 4, 2010 3:19:22 PM (14 years ago)

Author:

gah

Message:

 

File:

• branches/blt4/gui/scripts/scroller.tcl (modified) (4 diffs)

branches/blt4/gui/scripts/scroller.tcl

@@ -23 +23 @@
 option add *Scroller.height 0 widgetDefault
 
-itk::usual Scrollset {
-}
-
 itcl::class Rappture::Scroller {
     inherit itk::Widget
@@ -80 +77 @@
         "[itcl::code $this _fixsize]; list"
 
-    itk_component add scrollset {
-        blt::scrollset $itk_interior.ss
-    }
     itk_component add xsbar {
-        blt::tk::scrollbar $itk_interior.xsbar -orient horizontal
+        scrollbar $itk_interior.xsbar -orient horizontal
     }
     itk_component add ysbar {
-        blt::tk::scrollbar $itk_interior.ysbar -orient vertical
+        scrollbar $itk_interior.ysbar -orient vertical
     }
 
@@ -153 +147 @@
             frame $_frame.f
             $_frame create window 0 0 -anchor nw -window $_frame.f -tags frame
+            bind $_frame.f <Map> \
+                [itcl::code $_dispatcher event -idle !fixframe-inner]
             bind $_frame.f <Configure> \
                 [itcl::code $_dispatcher event -idle !fixframe-inner]
@@ -308 +304 @@
     switch -- $which {
         inner {
-            $_frame configure -scrollregion [$_frame bbox all]
+            set w [winfo reqwidth $_frame.f]
+            set h [winfo reqheight $_frame.f]
+            $_frame configure -scrollregion [list 0 0 $w $h]
+            _fixframe outer
+            _lock reset x
+            _lock reset y
             $_dispatcher event -idle !fixsize
         }