Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

3567778 Make Tk_MeasureChars() honor the TK_AT_LEAST_ONE flag properly.

  • Loading branch information...
commit 09d4163884854d6b0dd9a2fb5f0a6f909f37d59e 1 parent ce8ce4c
dgp authored
Showing with 10 additions and 2 deletions.
  1. +5 −0 ChangeLog
  2. +3 −1 changes
  3. +2 −1  macosx/tkMacOSXFont.c
View
5 ChangeLog
@@ -1,3 +1,8 @@
+2012-09-15 Don Porter <dgp@users.sourceforge.net>
+
+ * macosx/tkMacOSXFont.c: [Bug 3567778] Make Tk_MeasureChars() honor
+ the TK_AT_LEAST_ONE flag properly.
+
2012-09-13 Donal K. Fellows <dkf@users.sf.net>
* generic/ttk/ttkEntry.c (EntryDisplay): [Bug 3567453]: Clip regions
View
4 changes
@@ -7006,6 +7006,8 @@ and -to (porter)
2012-08-25 (bug fix)[3554026,3561016] crash with tearoff menus (gavilan)
+2012-09-15 (bug fix)[3567778] stop hang in wrapped label (porter)
+
Many revisions to better support a Cygwin environment (nijtmans)
---- Released 8.6b3, September 7, 2012 --- See ChangeLog for details ---
+--- Released 8.6b3, September 18, 2012 --- See ChangeLog for details ---
View
3  macosx/tkMacOSXFont.c
@@ -883,7 +883,8 @@ TkpMeasureCharsInContext(
/* The call to CTTypesetterSuggestClusterBreak above will always
return at least one character regardless of whether it exceeded
it or not. Clean that up now. */
- while (width > maxWidth && !(flags & TK_PARTIAL_OK) && index > start) {
+ while (width > maxWidth && !(flags & TK_PARTIAL_OK)
+ && index > start+(flags & TK_AT_LEAST_ONE)) {
range.length = --index;
line = CTTypesetterCreateLine(typesetter, range);
width = CTLineGetTypographicBounds(line, NULL, NULL, NULL);
Please sign in to comment.
Something went wrong with that request. Please try again.