Fixed not being able to scroll horizontally when the header is wider than the window but no items are displayed.

Merged the DINFO_REDO_COLUMN_WIDTH and DINFO_CHECK_COLUMN_WIDTH blocks. Recalculate tree->columnBgCnt here since it wasn't being done when columns were deleted etc.
Make sure whitespace is redrawn when changing from complex to non-complex drawing (i.e., drawing -itembackground colors).

3 files changed, 101 insertions, 59 deletions

diff --git a/generic/tkTreeColumn.c b/generic/tkTreeColumn.c
index e2a7e2c..a2857fd 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.62 2006/11/10 22:26:17 treectrl Exp $
+ * RCS: @(#) $Id: tkTreeColumn.c,v 1.63 2006/11/12 05:47:35 treectrl Exp $
  */
 
 #include "tkTreeCtrl.h"
@@ -2186,17 +2186,18 @@ Column_Config(
     }
 
     if (mask & COLU_CONF_ITEMBG) {
-	/* Set max -itembackground */
-	tree->columnBgCnt = 0;
-	walk = tree->columns;
-	while (walk != NULL) {
-	    if (walk->itemBgCount > tree->columnBgCnt)
-		tree->columnBgCnt = walk->itemBgCount;
-	    walk = walk->next;
+	if (!createFlag) {
+	    /* Set max -itembackground */
+	    tree->columnBgCnt = 0;
+	    walk = tree->columns;
+	    while (walk != NULL) {
+		if (walk->visible) {
+		    if (walk->itemBgCount > tree->columnBgCnt)
+			tree->columnBgCnt = walk->itemBgCount;
+		}
+		walk = walk->next;
+	    }
 	}
-	if (createFlag)
-	    if (column->itemBgCount > tree->columnBgCnt)
-		tree->columnBgCnt = column->itemBgCount;
 	Tree_DInfoChanged(tree, DINFO_INVALIDATE | DINFO_OUT_OF_DATE);
     }
 
diff --git a/generic/tkTreeCtrl.h b/generic/tkTreeCtrl.h
index 29d1b5a..d95e180 100644
--- a/generic/tkTreeCtrl.h
+++ b/generic/tkTreeCtrl.h
@@ -7,7 +7,7 @@
  * Copyright (c) 2002-2003 Christian Krone
  * Copyright (c) 2003 ActiveState Corporation
  *
- * RCS: @(#) $Id: tkTreeCtrl.h,v 1.71 2006/11/10 22:26:17 treectrl Exp $
+ * RCS: @(#) $Id: tkTreeCtrl.h,v 1.72 2006/11/12 05:47:35 treectrl Exp $
  */
 
 #include "tkPort.h"
@@ -791,6 +791,7 @@ extern void Tree_DrawTiledImage(TreeCtrl *tree, Drawable drawable, Tk_Image imag
 #define DINFO_REDO_INCREMENTS 0x1000
 #define DINFO_REDO_COLUMN_WIDTH 0x2000
 #define DINFO_REDO_SELECTION 0x4000
+#define DINFO_DRAW_WHITESPACE 0x8000
 extern void Tree_DInfoChanged(TreeCtrl *tree, int flags);
 
 extern void Tree_TheWorldHasChanged(Tcl_Interp *interp);
diff --git a/generic/tkTreeDisplay.c b/generic/tkTreeDisplay.c
index 7ed83c4..501400b 100644
--- a/generic/tkTreeDisplay.c
+++ b/generic/tkTreeDisplay.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2002-2006 Tim Baker
  *
- * RCS: @(#) $Id: tkTreeDisplay.c,v 1.60 2006/11/10 22:26:17 treectrl Exp $
+ * RCS: @(#) $Id: tkTreeDisplay.c,v 1.61 2006/11/12 05:47:35 treectrl Exp $
  */
 
 #include "tkTreeCtrl.h"
@@ -117,6 +117,9 @@ struct TreeDInfo_
     int incrementTop;		/* yScrollIncrement[] index of item at top */
     int incrementLeft;		/* xScrollIncrement[] index of item at left */
     TkRegion wsRgn;		/* Region containing whitespace */
+#ifdef COMPLEX_WHITESPACE
+    int complexWhitespace;
+#endif
     Tcl_HashTable itemVisHash;	/* Table of visible items */
     int requests;		/* Incremented for every call to
 				   Tree_EventuallyRedraw */
@@ -131,6 +134,10 @@ struct TreeDInfo_
 				 * item for displaying locked columns. */
 };
 
+#ifdef COMPLEX_WHITESPACE
+static int ComplexWhitespace(TreeCtrl *tree);
+#endif
+
 /*========*/
 
 void
@@ -677,6 +684,9 @@ Tree_TotalWidth(
     if (tree->totalWidth >= 0)
 	return tree->totalWidth;
 
+    if (dInfo->rangeFirst == NULL)
+	return tree->totalWidth = Tree_WidthOfColumns(tree);
+
     tree->totalWidth = 0;
     range = dInfo->rangeFirst;
     while (range != NULL) {
@@ -1080,7 +1090,9 @@ RItemsToIncrementsX(
     dInfo->xScrollIncrements = (int *) ckalloc(size * sizeof(int));
     dInfo->xScrollIncrements[dInfo->xScrollIncrementCount++] = 0;
 
-    if (rangeFirst->next == NULL) {
+    if (rangeFirst == NULL) {
+	/* Only the column headers are shown. */
+    } else if (rangeFirst->next == NULL) {
 	/* A single horizontal range is easy. Add one increment for the
 	 * left edge of each item. */
 	rItem = rangeFirst->first;
@@ -3539,7 +3551,9 @@ Range_RedoIfNeeded(
 	dInfo->flags &= ~DINFO_REDO_RANGES;
 
 #ifdef COMPLEX_WHITESPACE
-	TkSubtractRegion(dInfo->wsRgn, dInfo->wsRgn, dInfo->wsRgn);
+	if (ComplexWhitespace(tree)) {
+	    dInfo->flags |= DINFO_DRAW_WHITESPACE;
+	}
 #endif
 
 	/* Do this after clearing REDO_RANGES to prevent infinite loop */
@@ -3809,8 +3823,13 @@ ScrollHorizontalSimple(
     if (dInfo->xOrigin == tree->xOrigin)
 	return;
 
+    /* Only column headers are visible. */
+    if (dInfo->rangeFirst == NULL)
+	return;
+
     if (dInfo->empty)
 	return;
+
     minX = dInfo->bounds[0];
     minY = dInfo->bounds[1];
     maxX = dInfo->bounds[2];
@@ -3928,9 +3947,14 @@ ScrollVerticalSimple(
 	dItem->oldY = dItem->y;
     }
 
-    if (!Tree_AreaBbox(tree, TREE_AREA_CONTENT, &minX, &minY, &maxX, &maxY))
+    if (dInfo->empty)
 	return;
 
+    minX = dInfo->bounds[0];
+    minY = dInfo->bounds[1];
+    maxX = dInfo->bounds[2];
+    maxY = dInfo->bounds[3];
+
     offset = dInfo->yOrigin - tree->yOrigin;
 
     /* We only scroll the content, not the whitespace */
@@ -4398,13 +4422,23 @@ CalcWhiteSpaceRegion(
     maxX = dInfo->bounds[2];
     maxY = dInfo->bounds[3];
 
+    /* Only the header is visible. */
+    if (dInfo->rangeFirst == NULL) {
+	rect.x = minX;
+	rect.y = minY;
+	rect.width = maxX - rect.x;
+	rect.height = maxY - rect.y;
+	TkUnionRectWithRegion(&rect, wsRgn, wsRgn);
+	return wsRgn;
+    }
+
     if (tree->vertical) {
 	/* Erase area to right of last Range */
 	if (x + Tree_TotalWidth(tree) < maxX) {
 	    rect.x = x + Tree_TotalWidth(tree);
 	    rect.y = minY;
 	    rect.width = maxX - rect.x;
-	    rect.height = maxY - minY;
+	    rect.height = maxY - rect.y;
 	    TkUnionRectWithRegion(&rect, wsRgn, wsRgn);
 	}
     } else {
@@ -4412,7 +4446,7 @@ CalcWhiteSpaceRegion(
 	if (y + Tree_TotalHeight(tree) < maxY) {
 	    rect.x = minX;
 	    rect.y = y + Tree_TotalHeight(tree);
-	    rect.width = maxX - minX;
+	    rect.width = maxX - rect.x;
 	    rect.height = maxY - rect.y;
 	    TkUnionRectWithRegion(&rect, wsRgn, wsRgn);
 	}
@@ -4861,7 +4895,7 @@ DrawWhitespace(
 	}
 
 	/* Draw below non-locked columns. */
-	if (!dInfo->empty && dInfo->rangeFirst != NULL) {
+	if (!dInfo->empty && Tree_TotalWidth(tree)/* && dInfo->rangeFirst != NULL */) {
 	    DrawWhitespaceBelowItem(tree, drawable, COLUMN_LOCK_NONE,
 		    dInfo->bounds, x, top, dirtyRgn, columnRgn,
 		    height, index);
@@ -5096,6 +5130,9 @@ Tree_Display(
     int count;
     int numCopy = 0, numDraw = 0;
     TkRegion wsRgnNew, wsRgnDif;
+#ifdef COMPLEX_WHITESPACE
+    int complexWhitespace;
+#endif
     XRectangle wsBox;
     int requests;
 
@@ -5124,54 +5161,46 @@ displayRetry:
 	dInfo->flags &= ~(DINFO_REDO_SELECTION);
     }
 
-    /* A column was created or deleted */
-    if (dInfo->flags & DINFO_REDO_COLUMN_WIDTH) {
+    /* DINFO_REDO_COLUMN_WIDTH  - A column was created or deleted. */
+    /* DINFO_CHECK_COLUMN_WIDTH - The width of one or more columns
+    *				  *might* have changed. */
+    if (dInfo->flags & (DINFO_REDO_COLUMN_WIDTH | DINFO_CHECK_COLUMN_WIDTH)) {
 	TreeColumn treeColumn = tree->columns;
-	int columnIndex = 0;
+	ColumnInfo *cinfo;
+	int force = (dInfo->flags & DINFO_REDO_COLUMN_WIDTH) != 0;
+	int changed = force;
 
 	if (dInfo->columnsSize < tree->columnCount) {
 	    dInfo->columnsSize = tree->columnCount + 10;
 	    dInfo->columns = (ColumnInfo *) ckrealloc((char *) dInfo->columns,
 		    sizeof(ColumnInfo) * dInfo->columnsSize);
 	}
-	while (treeColumn != NULL) {
-	    dInfo->columns[columnIndex].column = treeColumn;
-	    dInfo->columns[columnIndex].offset = TreeColumn_Offset(treeColumn);
-	    dInfo->columns[columnIndex++].width = TreeColumn_UseWidth(treeColumn);
-	    treeColumn = TreeColumn_Next(treeColumn);
-	}
-	dInfo->flags &= ~(DINFO_REDO_COLUMN_WIDTH | DINFO_CHECK_COLUMN_WIDTH);
-	dInfo->flags |=
-	    DINFO_INVALIDATE |
-	    DINFO_OUT_OF_DATE |
-	    DINFO_REDO_RANGES |
-	    DINFO_DRAW_HEADER;
-    }
-    /* The width of one or more columns *might* have changed */
-    if (dInfo->flags & DINFO_CHECK_COLUMN_WIDTH) {
-	TreeColumn treeColumn = tree->columns;
-	int columnIndex = 0;
 
-	if (dInfo->columnsSize < tree->columnCount) {
-	    dInfo->columnsSize = tree->columnCount + 10;
-	    dInfo->columns = (ColumnInfo *) ckrealloc((char *) dInfo->columns,
-		    sizeof(ColumnInfo) * dInfo->columnsSize);
-	}
+	/* Set max -itembackground as well. */
+	tree->columnBgCnt = 0;
+
+	cinfo = dInfo->columns;
 	while (treeColumn != NULL) {
-	    dInfo->columns[columnIndex].column = treeColumn;
-	    dInfo->columns[columnIndex].offset = TreeColumn_Offset(treeColumn);
-	    if (dInfo->columns[columnIndex].width != TreeColumn_UseWidth(treeColumn)) {
-		dInfo->columns[columnIndex].width = TreeColumn_UseWidth(treeColumn);
-		dInfo->flags |=
-		    DINFO_INVALIDATE |
-		    DINFO_OUT_OF_DATE |
-		    DINFO_REDO_RANGES |
-		    DINFO_DRAW_HEADER;
+	    cinfo->column = treeColumn;
+	    cinfo->offset = TreeColumn_Offset(treeColumn);
+	    if (force || (cinfo->width != TreeColumn_UseWidth(treeColumn))) {
+		cinfo->width = TreeColumn_UseWidth(treeColumn);
+		changed = TRUE;
 	    }
-	    columnIndex++;
+	    if (TreeColumn_Visible(treeColumn) &&
+		    (TreeColumn_BackgroundCount(treeColumn) > tree->columnBgCnt))
+		tree->columnBgCnt = TreeColumn_BackgroundCount(treeColumn);
+	    ++cinfo;
 	    treeColumn = TreeColumn_Next(treeColumn);
 	}
-	dInfo->flags &= ~DINFO_CHECK_COLUMN_WIDTH;
+	dInfo->flags &= ~(DINFO_REDO_COLUMN_WIDTH | DINFO_CHECK_COLUMN_WIDTH);
+	if (changed) {
+	    dInfo->flags |=
+		DINFO_INVALIDATE |
+		DINFO_OUT_OF_DATE |
+		DINFO_REDO_RANGES |
+		DINFO_DRAW_HEADER;
+	}
     }
     if (dInfo->headerHeight != Tree_HeaderHeight(tree)) {
 	dInfo->headerHeight = Tree_HeaderHeight(tree);
@@ -5237,13 +5266,19 @@ displayRetry:
      *    -itembackground colors change, or a column moves), or
      * c) item/column sizes change (handled by Range_RedoIfNeeded).
      */
-    if (ComplexWhitespace(tree)) {
+    complexWhitespace = ComplexWhitespace(tree);
+    if (complexWhitespace) {
 	if ((dInfo->xOrigin != tree->xOrigin) ||
 		(dInfo->yOrigin != tree->yOrigin) ||
 		(dInfo->flags & DINFO_INVALIDATE)) {
-	    TkSubtractRegion(dInfo->wsRgn, dInfo->wsRgn, dInfo->wsRgn);
+	    dInfo->flags |= DINFO_DRAW_WHITESPACE;
 	}
     }
+    /* If tree->columnBgCnt was > 0 but is now 0, redraw whitespace. */
+    if (complexWhitespace != dInfo->complexWhitespace) {
+	dInfo->complexWhitespace = complexWhitespace;
+	dInfo->flags |= DINFO_DRAW_WHITESPACE;
+    }
 #endif
     /*
      * dInfo->requests counts the number of calls to Tree_EventuallyRedraw().
@@ -5408,6 +5443,11 @@ displayRetry:
 	}
     }
 
+    if (dInfo->flags & DINFO_DRAW_WHITESPACE) {
+	TkSubtractRegion(dInfo->wsRgn, dInfo->wsRgn, dInfo->wsRgn);
+	dInfo->flags &= ~DINFO_DRAW_WHITESPACE;
+    }
+
     if (tree->backgroundImage != NULL) {
 	wsRgnNew = CalcWhiteSpaceRegion(tree);
 
@@ -6249,8 +6289,8 @@ Tree_RelayoutWindow(
     dInfo->xOrigin = tree->xOrigin;
     dInfo->yOrigin = tree->yOrigin;
 
-    /* Needed if background color changes */
-    TkSubtractRegion(dInfo->wsRgn, dInfo->wsRgn, dInfo->wsRgn);
+    /* Needed if -background color changes */
+    dInfo->flags |= DINFO_DRAW_WHITESPACE;
 
     if (tree->doubleBuffer == DOUBLEBUFFER_WINDOW) {
 	if (dInfo->pixmap == None) {