summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--tests/textDisp.test33
2 files changed, 35 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index cf0957f..6db5df1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-27 Vince Darley <vincentdarley@users.sourceforge.net>
+
+ * tests/textDisp.test: added test for fix of 2005-03-15.
+
2005-03-24 Jim Ingham <jingham@apple.com>
* macosx/tkMacOSXEntry.c (TkpDrawEntryBorderAndFocus): Dopey
diff --git a/tests/textDisp.test b/tests/textDisp.test
index 501a788..517cafa 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -6,7 +6,7 @@
# Copyright (c) 1998-1999 by Scriptics Corporation.
# All rights reserved.
#
-# RCS: @(#) $Id: textDisp.test,v 1.34 2005/02/14 23:03:25 vincentdarley Exp $
+# RCS: @(#) $Id: textDisp.test,v 1.35 2005/03/27 15:03:47 vincentdarley Exp $
package require tcltest 2.1
eval tcltest::configure $argv
@@ -1742,6 +1742,36 @@ test textDisp-15.7 {ScrollByLines procedure, scrolling forwards} {
.t index @0,0
} {50.40}
+test textDisp-15.8 {Scrolling near end of window} {
+ set textheight 12
+ set textwidth 30
+
+ toplevel .tf
+ frame .tf.f -relief sunken -borderwidth 2
+ pack .tf.f -padx 10 -pady 10
+
+ text .tf.f.t -font {Courier 9} -height $textheight \
+ -width $textwidth -yscrollcommand ".tf.f.sb set"
+ scrollbar .tf.f.sb -command ".tf.f.t yview"
+ pack .tf.f.t -side left -expand 1 -fill both
+ pack .tf.f.sb -side right -fill y
+
+ .tf.f.t tag configure Header -font {Helvetica 14 bold italic} \
+ -wrap word -spacing1 12 -spacing3 4
+
+ .tf.f.t insert end "Foo" Header
+ for {set i 1} {$i < $textheight} {incr i} {
+ .tf.f.t insert end "\nLine $i"
+ }
+ update ; after 1000 ; update
+ # Should scroll and should not crash!
+ .tf.f.t yview scroll 1 unit
+ # Check that it has scrolled
+ set res [.tf.f.t index @0,[expr [winfo height .tf.f.t] - 15]]
+ destroy .tf
+ set res
+} {12.0}
+
.t configure -wrap char
.t delete 1.0 end
.t insert insert "Line 1"
@@ -3517,7 +3547,6 @@ test textDisp-31.7 {line update index shifting, elided} {
lappend res [.t count -ypixels 1.0 end]
set res
} [list [expr {$fixedHeight * 1}] [expr {$fixedHeight * 3}] [expr {$fixedHeight * 3}] [expr {$fixedHeight * 2}] [expr {$fixedHeight * 1}] [expr {$fixedHeight * 1}]]
-return
test textDisp-32.0 {everything elided} {
# Must not crash