From f85e7916a82767bfc0f9fdffbc13edb698456c06 Mon Sep 17 00:00:00 2001 From: fvogel Date: Sun, 1 Jan 2017 20:56:48 +0000 Subject: Fix [28a4535fa2]: Off-by-1 error on text widget index on OS X --- macosx/tkMacOSXFont.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c index d3e0e41..db36731 100644 --- a/macosx/tkMacOSXFont.c +++ b/macosx/tkMacOSXFont.c @@ -870,7 +870,7 @@ TkpMeasureCharsInContext( if (index <= start && !(flags & TK_WHOLE_WORDS)) { index = CTTypesetterSuggestClusterBreak(typesetter, start, maxWidth); } - cs = (index < len || (flags & TK_WHOLE_WORDS)) ? + cs = (index < len && (flags & TK_WHOLE_WORDS)) ? whitespaceCharacterSet : lineendingCharacterSet; while (index > start && [cs characterIsMember:[string characterAtIndex:(index - 1)]]) { -- cgit v0.12 From daf2eae38a06d6471872c5ff1987af418eddbfaf Mon Sep 17 00:00:00 2001 From: fvogel Date: Mon, 2 Jan 2017 13:19:02 +0000 Subject: 'Fixed' font-24.11 and unixfont-5.12 to fail again identically as they fail in core-8-6-branch. --- macosx/tkMacOSXFont.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c index db36731..b5ae1a3 100644 --- a/macosx/tkMacOSXFont.c +++ b/macosx/tkMacOSXFont.c @@ -870,7 +870,7 @@ TkpMeasureCharsInContext( if (index <= start && !(flags & TK_WHOLE_WORDS)) { index = CTTypesetterSuggestClusterBreak(typesetter, start, maxWidth); } - cs = (index < len && (flags & TK_WHOLE_WORDS)) ? + cs = (index <= len && (flags & TK_WHOLE_WORDS)) ? whitespaceCharacterSet : lineendingCharacterSet; while (index > start && [cs characterIsMember:[string characterAtIndex:(index - 1)]]) { -- cgit v0.12