diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2009-11-19 10:22:07 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2009-11-19 10:22:07 (GMT) |
| commit | 1501cea96479e7bbb0ffb3eade53e0581934d037 (patch) | |
| tree | be6461eee33ab617b0d18d757c3dff91994fe3c0 | |
| parent | a4b2d6ee04e7b7735b398a9030e5d22a649cbed2 (diff) | |
| download | tk-1501cea96479e7bbb0ffb3eade53e0581934d037.zip tk-1501cea96479e7bbb0ffb3eade53e0581934d037.tar.gz tk-1501cea96479e7bbb0ffb3eade53e0581934d037.tar.bz2 | |
Fix [Bug 2900121] by inverting the sense of the test.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tkCanvLine.c | 16 |
2 files changed, 13 insertions, 8 deletions
@@ -1,3 +1,8 @@ +2009-11-19 Donal K. Fellows <dkf@users.sf.net> + + * generic/tkCanvLine.c (LineDeleteCoords): [Bug 2900121]: Get sense of + test for drawing optimization correct. + 2009-11-15 Donal K. Fellows <dkf@users.sf.net> * doc/ttk_treeview.n (detach): Added note that the 'move' operation diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c index f01fe2e..f2b2b4e 100644 --- a/generic/tkCanvLine.c +++ b/generic/tkCanvLine.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvLine.c,v 1.29 2009/11/19 10:14:06 dkf Exp $ + * RCS: @(#) $Id: tkCanvLine.c,v 1.30 2009/11/19 10:22:07 dkf Exp $ */ #include <stdio.h> @@ -25,7 +25,7 @@ typedef enum { ARROWS_NONE, ARROWS_FIRST, ARROWS_LAST, ARROWS_BOTH } Arrows; -typedef struct LineItem { +typedef struct LineItem { Tk_Item header; /* Generic stuff that's the same for all * types. MUST BE FIRST IN STRUCTURE. */ Tk_Outline outline; /* Outline structure */ @@ -420,9 +420,9 @@ LineCoords( for (i = 0; i < objc ; i++) { if (Tk_CanvasGetCoordFromObj(interp, canvas, objv[i], coordPtr++) != TCL_OK) { - return TCL_ERROR; - } - } + return TCL_ERROR; + } + } /* * Update arrowheads by throwing away any existing arrow-head @@ -469,7 +469,7 @@ ConfigureLine( Tcl_Interp *interp, /* Used for error reporting. */ Tk_Canvas canvas, /* Canvas containing itemPtr. */ Tk_Item *itemPtr, /* Line item to reconfigure. */ - int objc, /* Number of elements in objv. */ + int objc, /* Number of elements in objv. */ Tcl_Obj *const objv[], /* Arguments describing things to configure. */ int flags) /* Flags to pass to Tk_ConfigureWidget. */ { @@ -908,7 +908,7 @@ DisplayLine( } else { int intwidth = (int) (linewidth + 0.5); - if (intwidth < 1) { + if (intwidth < 1) { intwidth = 1; } XFillArc(display, drawable, linePtr->outline.gc, @@ -1200,7 +1200,7 @@ LineDeleteCoords( } } - if ((first1 < 2) && (last1 >= length-2)) { + if ((first1 >= 2) || (last1 < length-2)) { /* * This is some optimizing code that will result that only the part of * the line that changed (and the objects that are overlapping with |