diff options
| author | treectrl <treectrl> | 2006-09-27 01:49:41 (GMT) |
|---|---|---|
| committer | treectrl <treectrl> | 2006-09-27 01:49:41 (GMT) |
| commit | a26ba3a0e12bff3a6742172b5bf15ff8469cb6df (patch) | |
| tree | 09f68e4b62670d1f3e97106983f5ba549e24d4a0 /generic/tkTreeStyle.c | |
| parent | c832fbec8ffe35e1b5a0f4927d44e6229526fe59 (diff) | |
| download | tktreectrl-a26ba3a0e12bff3a6742172b5bf15ff8469cb6df.zip tktreectrl-a26ba3a0e12bff3a6742172b5bf15ff8469cb6df.tar.gz tktreectrl-a26ba3a0e12bff3a6742172b5bf15ff8469cb6df.tar.bz2 | |
Set ElementArgs.display.bounds in two places to support clipping of window elements.
Diffstat (limited to 'generic/tkTreeStyle.c')
| -rw-r--r-- | generic/tkTreeStyle.c | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/generic/tkTreeStyle.c b/generic/tkTreeStyle.c index 613a186..1c33bb5 100644 --- a/generic/tkTreeStyle.c +++ b/generic/tkTreeStyle.c @@ -5,7 +5,7 @@ * * Copyright (c) 2002-2006 Tim Baker * - * RCS: @(#) $Id: tkTreeStyle.c,v 1.48 2006/09/22 23:27:23 treectrl Exp $ + * RCS: @(#) $Id: tkTreeStyle.c,v 1.49 2006/09/27 01:49:41 treectrl Exp $ */ #include "tkTreeCtrl.h" @@ -2127,12 +2127,24 @@ void TreeStyle_Draw( Style *style = (Style *) drawArgs->style; TreeCtrl *tree = drawArgs->tree; ElementArgs args; - int i; + int i, x, y; struct Layout staticLayouts[STATIC_SIZE], *layouts = staticLayouts; int debugDraw = FALSE; Style_CheckNeededSize(tree, style, drawArgs->state); + /* Get the bounds allowed for drawing (in window coordinates), inside + * the item-column(s) and inside the header/borders. */ + x = drawArgs->x + tree->drawableXOrigin - tree->xOrigin; + y = drawArgs->y + tree->drawableYOrigin - tree->yOrigin; + args.display.bounds[0] = MAX(tree->inset, x); + args.display.bounds[1] = MAX(tree->inset + Tree_HeaderHeight(tree), y); + args.display.bounds[2] = MIN(x + drawArgs->width, + Tk_Width(tree->tkwin) - tree->inset); + args.display.bounds[3] = MIN(y + drawArgs->height, + Tk_Height(tree->tkwin) - tree->inset); + + /* We never lay out the style at less than the minimum size */ if (drawArgs->width < style->minWidth + drawArgs->indent) drawArgs->width = style->minWidth + drawArgs->indent; if (drawArgs->height < style->minHeight) @@ -2276,12 +2288,24 @@ TreeStyle_UpdateWindowPositions( Style *style = (Style *) drawArgs->style; TreeCtrl *tree = drawArgs->tree; ElementArgs args; - int i; + int i, x, y; struct Layout staticLayouts[STATIC_SIZE], *layouts = staticLayouts; /* FIXME: Perhaps remember whether this style has any window * elements */ + /* Get the bounds allowed for drawing (in window coordinates), inside + * the item-column(s) and inside the header/borders. */ + x = drawArgs->x + tree->drawableXOrigin - tree->xOrigin; + y = drawArgs->y + tree->drawableYOrigin - tree->yOrigin; + args.display.bounds[0] = MAX(tree->inset, x); + args.display.bounds[1] = MAX(tree->inset + Tree_HeaderHeight(tree), y); + args.display.bounds[2] = MIN(x + drawArgs->width, + Tk_Width(tree->tkwin) - tree->inset); + args.display.bounds[3] = MIN(y + drawArgs->height, + Tk_Height(tree->tkwin) - tree->inset); + + /* We never lay out the style at less than the minimum size */ if (drawArgs->width < style->minWidth + drawArgs->indent) drawArgs->width = style->minWidth + drawArgs->indent; if (drawArgs->height < style->minHeight) |