summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2012-01-26 07:21:56 (GMT)
committerfvogel <fvogelnew1@free.fr>2012-01-26 07:21:56 (GMT)
commit03a1644228c1aa944f69e81c9dc69c26932ed024 (patch)
tree34127481c337f273879121f320fd31b9d4f8b9ce
parent7b67c9d7fc26e929fe3696b840dce11a5d8ed25b (diff)
parent03a59b0e85ec9611656c4277d58e3202095e158b (diff)
downloadtk-03a1644228c1aa944f69e81c9dc69c26932ed024.zip
tk-03a1644228c1aa944f69e81c9dc69c26932ed024.tar.gz
tk-03a1644228c1aa944f69e81c9dc69c26932ed024.tar.bz2
[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.
-rw-r--r--ChangeLog6
-rw-r--r--generic/tkTextDisp.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f0663cd..fcbb3a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-26 Francois Vogel <fvogelnew1@free.fr>
+
+ * 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 Jan Nijtmans <nijtmans@users.sf.net>
* generic/tkImgPhoto.c: [Bug 2433260]: non-critical error in
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 4eca4ca..249f476 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -6850,6 +6850,9 @@ TkTextIndexBbox(
if (charWidthPtr != NULL) {
*charWidthPtr = dInfoPtr->maxX - *xPtr;
+ if (*charWidthPtr > textPtr->charWidth) {
+ *charWidthPtr = textPtr->charWidth;
+ }
}
if (*xPtr > dInfoPtr->maxX) {
*xPtr = dInfoPtr->maxX;