Changeset 1085 for trunk/src/comctl32/header.c

Timestamp:

Sep 28, 1999, 6:36:04 PM (26 years ago)

Author:

cbratschi

Message:

improvements

File:

• trunk/src/comctl32/header.c (modified) (6 diffs)

trunk/src/comctl32/header.c

@@ -1 @@
-/* $Id: header.c,v 1.9 1999-09-18 12:21:25 cbratschi Exp $ */
+/* $Id: header.c,v 1.10 1999-09-28 16:36:04 cbratschi Exp $ */
 /*
  *  Header control
@@ -21 +21 @@
  *     HEADER_DrawItem.
  *   - Little flaw when drawing a bitmap on the right side of the text.
+ *
+ * Status: Development in progress
+ * Version: Unknown
  */
 
@@ -36 +39 @@
 #define VERT_BORDER     4
 #define DIVIDER_WIDTH  10
+#define MIN_ITEMWIDTH  0
 
 #define HEADER_GetInfoPtr(hwnd) ((HEADER_INFO *)GetWindowLongA(hwnd,0))
@@ -426 +430 @@
     oldRop = SetROP2 (hdc, R2_XORPEN);
     MoveToEx (hdc, x, rect.top, NULL);
-    LineTo (hdc, x, rect.bottom-1);
+    LineTo (hdc, x, rect.bottom);
     SetROP2 (hdc, oldRop);
     SelectObject (hdc, hOldPen);
@@ -1263 +1267 @@
             if (HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGINGA, infoPtr->iMoveItem))
                 infoPtr->items[infoPtr->iMoveItem].cxy = infoPtr->nOldWidth;
-            else {
+            else
+            {
                 nWidth = pt.x - infoPtr->items[infoPtr->iMoveItem].rect.left + infoPtr->xTrackOffset;
-                if (nWidth < 0)
-                    nWidth = 0;
-                infoPtr->items[infoPtr->iMoveItem].cxy = nWidth;
-                HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGEDA, infoPtr->iMoveItem);
-            }
-
-            HEADER_SetItemBounds (hwnd);
-            hdc = GetDC (hwnd);
-            HEADER_Refresh (hwnd, hdc);
-            ReleaseDC (hwnd, hdc);
+                if (nWidth < MIN_ITEMWIDTH)
+                    nWidth = MIN_ITEMWIDTH;
+
+                if (infoPtr->nOldWidth != nWidth)
+                {
+                  RECT rect;
+
+                  infoPtr->items[infoPtr->iMoveItem].cxy = nWidth;
+                  HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGEDA, infoPtr->iMoveItem);
+
+                  GetClientRect(hwnd,&rect);
+                  rect.left = infoPtr->items[infoPtr->iMoveItem].rect.right-2;
+                  HEADER_SetItemBounds (hwnd);
+                  rect.left = MIN(infoPtr->items[infoPtr->iMoveItem].rect.right-2,rect.left);
+                  InvalidateRect(hwnd,&rect,FALSE);
+                }
+            }
         }
     }
@@ -1344 +1356 @@
                 else {
                     nWidth = pt.x - infoPtr->items[infoPtr->iMoveItem].rect.left + infoPtr->xTrackOffset;
-                    if (nWidth < 0)
-                        nWidth = 0;
+                    if (nWidth < MIN_ITEMWIDTH)
+                        nWidth = MIN_ITEMWIDTH;
                     infoPtr->items[infoPtr->iMoveItem].cxy = nWidth;
                     HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGEDA,