summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2012-01-25 21:56:08 (GMT)
committerfvogel <fvogelnew1@free.fr>2012-01-25 21:56:08 (GMT)
commit0c6f1728590dc6ab2ad6d99559d75aaaecf9baa4 (patch)
treef56861ecb86be891ad2a2a119394eabf66cb9aed
parenta79dffd5ead82f09cf96cfb5744ff829e473ebce (diff)
downloadtk-0c6f1728590dc6ab2ad6d99559d75aaaecf9baa4.zip
tk-0c6f1728590dc6ab2ad6d99559d75aaaecf9baa4.tar.gz
tk-0c6f1728590dc6ab2ad6d99559d75aaaecf9baa4.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.patch_3479498
-rw-r--r--ChangeLog6
-rw-r--r--generic/tkTextDisp.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 96daf72..4eb7554 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-?? 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 Francois Vogel <fvogelnew1@free.fr>
* 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;