diff options
| author | fvogel <fvogelnew1@free.fr> | 2015-02-11 20:45:27 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2015-02-11 20:45:27 (GMT) |
| commit | 784583fabc13c80d219daf0a6acdbfc62783239d (patch) | |
| tree | 57bf5e7e7250b84bc16d7fa0fa19dfecde1daa96 | |
| parent | 968a521de8898dbeb3926a2af63004958ad5f7d0 (diff) | |
| parent | 7f41da748fce16f6accf68d1beed3e4a7e78ed71 (diff) | |
| download | tk-784583fabc13c80d219daf0a6acdbfc62783239d.zip tk-784583fabc13c80d219daf0a6acdbfc62783239d.tar.gz tk-784583fabc13c80d219daf0a6acdbfc62783239d.tar.bz2 | |
Merged core-8-5-branch
| -rw-r--r-- | generic/tkTextBTree.c | 14 | ||||
| -rw-r--r-- | tests/textBTree.test | 16 |
2 files changed, 15 insertions, 15 deletions
diff --git a/generic/tkTextBTree.c b/generic/tkTextBTree.c index eaab652..7383d21 100644 --- a/generic/tkTextBTree.c +++ b/generic/tkTextBTree.c @@ -3615,20 +3615,6 @@ TkTextIsElided( infoPtr->elidePriority = -1; for (i = infoPtr->numTags-1; i >=0; i--) { if (infoPtr->tagCnts[i] & 1) { - /* - * Who would make the selection elided? - */ - - if ((tagPtr == textPtr->selTagPtr) - && !(textPtr->flags & GOT_FOCUS) - && (textPtr->inactiveSelBorder == NULL -#ifdef MAC_OSX_TK - /* Don't show inactive selection in disabled widgets. */ - || textPtr->state == TK_TEXT_STATE_DISABLED -#endif - )) { - continue; - } infoPtr->elide = infoPtr->tagPtrs[i]->elide; /* diff --git a/tests/textBTree.test b/tests/textBTree.test index 41b3d98..ebd6c50 100644 --- a/tests/textBTree.test +++ b/tests/textBTree.test @@ -872,7 +872,21 @@ test btree-14.1 {check tag presence} -setup { } -cleanup { destroy .t } -result {x y z} - +test btree-14.2 {TkTextIsElided} -setup { + destroy .t + text .t +} -body { + .t delete 1.0 end + .t tag config hidden -elide 1 + .t insert end "Line1\nLine2\nLine3\n" + .t tag add hidden 2.0 3.0 + .t tag add sel 1.2 3.2 + # next line used to panic because of "Bad tag priority being toggled on" + # (see bug [382da038c9]) + .t index "2.0 - 1 display line linestart" +} -cleanup { + destroy .t +} -result {1.0} test btree-15.1 {rebalance with empty node} -setup { destroy .t |