Subject: [Bug-1754043] and [Bug-2321450]: When -blockcursor is true, the cursor appears as a blinking bar which expands to the right edge of the widget.

From: fvogel <[email-masked]>
Date: Wed, 25 Jan 2012 21:56:08 +0000

---
 ChangeLog            | 6 ++++++
 generic/tkTextDisp.c | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 96daf72..4eb7554 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-??  Francois Vogel  <[email-masked]>
+
+	* generic/tkTextDisp.c: [Bug-1754043] and [Bug-2321450]: When
+	-blockcursor is true, the cursor appears as a blinking bar which
+	expands to the right edge of the widget.
+
 2012-01-25  Francois Vogel  <[email-masked]>
 
 	* generic/tkText.c: Don't increase the epoch twice
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 144bca9..5f30b11 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -6851,6 +6851,9 @@ TkTextIndexBbox(
 
 	if (charWidthPtr != NULL) {
 	    *charWidthPtr = dInfoPtr->maxX - *xPtr;
+            if (*charWidthPtr > textPtr->charWidth) {
+                *charWidthPtr = textPtr->charWidth;
+            }
 	}
 	if (*xPtr > dInfoPtr->maxX) {
 	    *xPtr = dInfoPtr->maxX;
-- 
cgit v0.12