diff options
| author | treectrl <treectrl> | 2005-05-19 20:30:28 (GMT) |
|---|---|---|
| committer | treectrl <treectrl> | 2005-05-19 20:30:28 (GMT) |
| commit | 36224d200b1e5c0aeb7698dae3b2a361536728d8 (patch) | |
| tree | 80231afbc5b7f4e1a1a1cccdfdad4ec009b07bcb /generic | |
| parent | a02f82f79173fc88c942c16fc6b844f56c8e46e7 (diff) | |
| download | tktreectrl-36224d200b1e5c0aeb7698dae3b2a361536728d8.zip tktreectrl-36224d200b1e5c0aeb7698dae3b2a361536728d8.tar.gz tktreectrl-36224d200b1e5c0aeb7698dae3b2a361536728d8.tar.bz2 | |
Call XSetClipOrigin after drawing bitmap.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkTreeColumn.c | 3 | ||||
| -rw-r--r-- | generic/tkTreeElem.c | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/generic/tkTreeColumn.c b/generic/tkTreeColumn.c index c7d6eae..dd7ad98 100644 --- a/generic/tkTreeColumn.c +++ b/generic/tkTreeColumn.c @@ -7,7 +7,7 @@ * Copyright (c) 2002-2003 Christian Krone * Copyright (c) 2003 ActiveState Corporation * - * RCS: @(#) $Id: tkTreeColumn.c,v 1.23 2005/05/17 01:19:37 treectrl Exp $ + * RCS: @(#) $Id: tkTreeColumn.c,v 1.24 2005/05/19 20:32:25 treectrl Exp $ */ #include "tkTreeCtrl.h" @@ -2317,6 +2317,7 @@ static void Column_DrawArrow(Column *column, Drawable drawable, int x, int y, 0, 0, (unsigned int) layout.arrowWidth, (unsigned int) layout.arrowHeight, bx, by, 1); + XSetClipOrigin(tree->display, gc, 0, 0); Tk_FreeGC(tree->display, gc); return; } diff --git a/generic/tkTreeElem.c b/generic/tkTreeElem.c index a1e72fa..7daabb2 100644 --- a/generic/tkTreeElem.c +++ b/generic/tkTreeElem.c @@ -5,7 +5,7 @@ * * Copyright (c) 2002-2005 Tim Baker * - * RCS: @(#) $Id: tkTreeElem.c,v 1.19 2005/05/17 01:23:31 treectrl Exp $ + * RCS: @(#) $Id: tkTreeElem.c,v 1.20 2005/05/19 20:30:28 treectrl Exp $ */ #include "tkTreeCtrl.h" @@ -476,6 +476,7 @@ static void DisplayProcBitmap(ElementArgs *args) XCopyPlane(tree->display, bitmap, args->display.drawable, gc, 0, 0, (unsigned int) imgW, (unsigned int) imgH, bx, by, 1); + XSetClipOrigin(tree->display, gc, 0, 0); Tk_FreeGC(tree->display, gc); } } @@ -1861,8 +1862,8 @@ static void DisplayProcRect(ElementArgs *args) color = color2; } if (color != NULL) { - XFillRectangle(tree->display, args->display.drawable, - Tk_GCForColor(color, Tk_WindowId(tree->tkwin)), + GC gc = Tk_GCForColor(color, Tk_WindowId(tree->tkwin)); + XFillRectangle(tree->display, args->display.drawable, gc, args->display.x, args->display.y, args->display.width, args->display.height); } @@ -1875,11 +1876,11 @@ static void DisplayProcRect(ElementArgs *args) } if ((color != NULL) && (outlineWidth > 0)) { GC gc = Tk_GCForColor(color, Tk_WindowId(tree->tkwin)); +#if 0 int w1, w2; w1 = outlineWidth / 2; w2 = outlineWidth - w1; -#if 0 if (open == 0) { XDrawRectangle(tree->display, args->display.drawable, gc, args->display.x + w1, args->display.y + w1, |