Changeset 3030 for trunk

Timestamp:

Jun 11, 2012, 7:49:48 PM (12 years ago)

Author:

mmc

Message:

Fix for #262267, problem with side-by-side scrolling in the Rappture
tester. Scrolling one side with the scroll wheel should scroll the
other side too. Fixed.

Fix for #262266, scrolling in the failed results area doesn't work
correctly. When the list of differences for a test is scrolled up,
you should be able to highlight elements and select them properly.

Fixed bgerrors related to the new ResultSet? when you hit "X" to close
a Rappture application.

Location:

trunk

Files:

• gui/scripts/analyzer.tcl (modified) (1 diff)
• gui/scripts/resultselector.tcl (modified) (1 diff)
• tester/scripts/statuslist.tcl (modified) (1 diff)
• tester/scripts/stringdiffs.tcl (modified) (3 diffs)

trunk/gui/scripts/analyzer.tcl

@@ -363 +363 @@
 itcl::body Rappture::Analyzer::destructor {} {
     after cancel [itcl::code $this simulate]
+    $_resultset notify remove $this
     itcl::delete object $_resultset
 }

trunk/gui/scripts/resultselector.tcl

@@ -410 +410 @@
 itcl::body Rappture::ResultSelector::_fixControls {args} {
     array set eventData $args
+    if {![info exists itk_component(dials)]} {
+        # no controls? then nothing to fix
+        # this happens when the widget is being destroyed
+        return
+    }
     set shortlist $itk_component(dials)
 

trunk/tester/scripts/statuslist.tcl

@@ -289 +289 @@
     set c $itk_component(listview)
 
+    # translate the screen y to the canvas y (may be scrolled down)
+    set y [$c canvasy $y]
+
     set index ""
     foreach id [$c find overlapping 10 $y 10 $y] {

trunk/tester/scripts/stringdiffs.tcl

@@ -32 +32 @@
 
     protected method _yview {args}
+    protected method _ysbar {args}
 }
 
@@ -128 +129 @@
     $itk_component(body1) configure \
         -xscrollcommand [list $itk_component(xsbar1) set] \
-        -yscrollcommand [list $itk_component(ysbar) set]
+        -yscrollcommand [itcl::code $this _ysbar body1]
     $itk_component(body2) configure \
-        -xscrollcommand [list $itk_component(xsbar2) set]
+        -xscrollcommand [list $itk_component(xsbar2) set] \
+        -yscrollcommand [itcl::code $this _ysbar body2]
 
     grid $itk_component(title1) -row 0 -column 0 -sticky nsew
@@ -205 +207 @@
 # USAGE: _yview <arg> <arg>...
 #
-# Loads two values into the viewer and shows their differences.
-# If the strings are short, the diffs are shown inline.  Otherwise,
-# they are show with side-by-side viewers.
+# Called whenever the scrollbar changes the y-view of the diffs.
+# Sends the new command along to both views so they are aligned.
 # ----------------------------------------------------------------------
 itcl::body Rappture::Tester::StringDiffs::_yview {args} {
     eval $itk_component(body1) yview $args
     eval $itk_component(body2) yview $args
+}
+
+# ----------------------------------------------------------------------
+# USAGE: _ysbar <whichChanged> <arg> <arg>...
+#
+# Called whenever the y-view of one widget changes.  Copies the 
+# current view from the <whichChanged> widget to the other side,
+# and updates the bubble to display the correct view.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Tester::StringDiffs::_ysbar {which args} {
+    switch -- $which {
+        body1 {
+            set pos [lindex [$itk_component(body1) yview] 0]
+            $itk_component(body2) yview moveto $pos
+        }
+        body2 {
+            set pos [lindex [$itk_component(body2) yview] 0]
+            $itk_component(body1) yview moveto $pos
+        }
+    }
+    eval $itk_component(ysbar) set $args
 }