diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-09-12 13:44:21 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-09-12 13:44:21 (GMT) |
| commit | 1b30d8c64b83b3bb2baaac173fc5dfc1d80c1e26 (patch) | |
| tree | 68614c5ec9a91467e76d7e3f2de5fd8e05404c11 | |
| parent | 505bc4fa69263f911d5731495c4aebba6635d001 (diff) | |
| parent | 799666382d309825a9bd5d7205fd05662a742391 (diff) | |
| download | tk-1b30d8c64b83b3bb2baaac173fc5dfc1d80c1e26.zip tk-1b30d8c64b83b3bb2baaac173fc5dfc1d80c1e26.tar.gz tk-1b30d8c64b83b3bb2baaac173fc5dfc1d80c1e26.tar.bz2 | |
merge core-8-5-branchtk_cocoa_8_5_backport
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | generic/ttk/ttkEntry.c | 3 | ||||
| -rw-r--r-- | generic/ttk/ttkLabel.c | 12 |
3 files changed, 17 insertions, 6 deletions
@@ -1,3 +1,11 @@ +2012-09-11 Donal K. Fellows <dkf@users.sf.net> + + * generic/ttk/ttkEntry.c (EntryDisplay): [Bug 3566594]: Must manually + * generic/ttk/ttkLabel.c (TextDraw): reset the clip region of GCs + when not using the Xft font renderer (well, especially on classic X11) + because the GC sharing code doesn't take into account clip handling. + Thanks to Christian Nassau for identifying the problem. + 2012-08-28 Andreas Kupries <andreask@activestate.com> Cherrypick Merge, Backport of [6223d9e067]. diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c index a3d0179..22da65c 100644 --- a/generic/ttk/ttkEntry.c +++ b/generic/ttk/ttkEntry.c @@ -1254,6 +1254,7 @@ static void EntryDisplay(void *clientData, Drawable d) gc = EntryGetGC(entryPtr, es.insertColorObj, clipRegion); XFillRectangle(Tk_Display(tkwin), d, gc, cursorX-cursorWidth/2, cursorY, cursorWidth, cursorHeight); + TkSetRegion(Tk_Display(tkwin), gc, None); Tk_FreeGC(Tk_Display(tkwin), gc); } @@ -1264,6 +1265,7 @@ static void EntryDisplay(void *clientData, Drawable d) Tk_Display(tkwin), d, gc, entryPtr->entry.textLayout, entryPtr->entry.layoutX, entryPtr->entry.layoutY, leftIndex, rightIndex); + TkSetRegion(Tk_Display(tkwin), gc, None); Tk_FreeGC(Tk_Display(tkwin), gc); /* Overwrite the selected portion (if any) in the -selectforeground color: @@ -1274,6 +1276,7 @@ static void EntryDisplay(void *clientData, Drawable d) Tk_Display(tkwin), d, gc, entryPtr->entry.textLayout, entryPtr->entry.layoutX, entryPtr->entry.layoutY, selFirst, selLast); + TkSetRegion(Tk_Display(tkwin), gc, None); Tk_FreeGC(Tk_Display(tkwin), gc); } diff --git a/generic/ttk/ttkLabel.c b/generic/ttk/ttkLabel.c index 6dd1a9e..55bf36d 100644 --- a/generic/ttk/ttkLabel.c +++ b/generic/ttk/ttkLabel.c @@ -161,8 +161,6 @@ static void TextDraw(TextElement *text, Tk_Window tkwin, Drawable d, Ttk_Box b) TkSetRegion(Tk_Display(tkwin), gc2, clipRegion); #ifdef HAVE_XFT TkUnixSetXftClipRegion(clipRegion); -#else - TkDestroyRegion(clipRegion); #endif } @@ -183,14 +181,16 @@ static void TextDraw(TextElement *text, Tk_Window tkwin, Drawable d, Ttk_Box b) text->textLayout, b.x, b.y, underline); } - Tk_FreeGC(Tk_Display(tkwin), gc1); - Tk_FreeGC(Tk_Display(tkwin), gc2); -#ifdef HAVE_XFT if (clipRegion != NULL) { +#ifdef HAVE_XFT TkUnixSetXftClipRegion(None); +#endif + TkSetRegion(Tk_Display(tkwin), gc1, None); + TkSetRegion(Tk_Display(tkwin), gc2, None); TkDestroyRegion(clipRegion); } -#endif + Tk_FreeGC(Tk_Display(tkwin), gc1); + Tk_FreeGC(Tk_Display(tkwin), gc2); } static void TextElementSize( |