diff options
| author | fvogel <fvogelnew1@free.fr> | 2022-08-29 19:46:26 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2022-08-29 19:46:26 (GMT) |
| commit | 511a53e555a467a0e348020aae66bf07e0d71b7a (patch) | |
| tree | 1cad3a5fd36f888b3561a69cef675ca34997fc5a /generic | |
| parent | ca1975bcca68c9b40fd9145575c04a6a8fd2e2d5 (diff) | |
| download | tk-511a53e555a467a0e348020aae66bf07e0d71b7a.zip tk-511a53e555a467a0e348020aae66bf07e0d71b7a.tar.gz tk-511a53e555a467a0e348020aae66bf07e0d71b7a.tar.bz2 | |
Revert [d507fe93] since it is not a correct fix.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/ttk/ttkTreeview.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c index 6e157e1..7a5438a 100644 --- a/generic/ttk/ttkTreeview.c +++ b/generic/ttk/ttkTreeview.c @@ -8,8 +8,6 @@ #include "ttkTheme.h" #include "ttkWidget.h" -#define MAX(a,b) (a > b ? a : b) - #define DEF_TREE_ROWS "10" #define DEF_COLWIDTH "200" #define DEF_MINWIDTH "20" @@ -1652,8 +1650,8 @@ static int TreeviewSize(void *clientData, int *widthPtr, int *heightPtr) Ttk_LayoutSize(tv->core.layout, tv->core.state, &padWidth, &padHeight); Tcl_GetIntFromObj(NULL, tv->tree.heightObj, &nRows); - *widthPtr = MAX(padWidth, TreeWidth(tv)); - *heightPtr = MAX(padHeight, tv->tree.rowHeight * nRows); + *widthPtr = padWidth + TreeWidth(tv); + *heightPtr = padHeight + tv->tree.rowHeight * nRows; if (tv->tree.showFlags & SHOW_HEADINGS) { *heightPtr += tv->tree.headingHeight; |