Changeset 10098 for trunk/src/comctl32/tab.c

Timestamp:

May 15, 2003, 4:26:27 PM (22 years ago)

Author:

sandervl

Message:

Wine resync

File:

• trunk/src/comctl32/tab.c (modified) (40 diffs)

trunk/src/comctl32/tab.c

@@ -59 +59 @@
   INT        tabHeight;       /* height of the tab row */
   INT        tabWidth;        /* width of tabs */
+  USHORT     uHItemPadding;   /* amount of horizontal padding, in pixels */
+  USHORT     uVItemPadding;   /* amount of vertical padding, in pixels */
   HFONT      hFont;           /* handle to the current font */
   HCURSOR    hcurArrow;       /* handle to the current cursor */
@@ -81 +83 @@
  */
 #define SELECTED_TAB_OFFSET     2
-#define HORIZONTAL_ITEM_PADDING 6
-#define VERTICAL_ITEM_PADDING   3
 #define ROUND_CORNER_SIZE       2
 #define DISPLAY_AREA_PADDINGX   2
@@ -173 +173 @@
               iItem, ti->mask, ti->dwState, debugstr_w(ti->pszText),
               ti->iImage);
-        TRACE("tab %d, lParam=0x%08lx, rect.left=%d, rect.top(row)=%d\n",
+        TRACE("tab %d, lParam=0x%08lx, rect.left=%ld, rect.top(row)=%ld\n",
               iItem, ti->lParam, ti->rect.left, ti->rect.top);
     }
@@ -259 +259 @@
 }
 
+static LRESULT
+TAB_SetPadding (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
+    
+    if (infoPtr == NULL) return 0;
+    infoPtr->uHItemPadding=LOWORD(lParam);
+    infoPtr->uVItemPadding=HIWORD(lParam);
+    return 0;
+}
+
 /******************************************************************************
  * TAB_InternalGetItemRect
@@ -367 +378 @@
              0);
   }
-  TRACE("item %d tab h=%d, rect=(%d,%d)-(%d,%d)\n",
+  TRACE("item %d tab h=%d, rect=(%ld,%ld)-(%ld,%ld)\n",
         itemIndex, infoPtr->tabHeight,
         itemRect->left, itemRect->top, itemRect->right, itemRect->bottom);
@@ -488 +499 @@
   if (isVisible)
   {
-      TRACE("invalidate (%d,%d)-(%d,%d)\n",
+      TRACE("invalidate (%ld,%ld)-(%ld,%ld)\n",
             selectedRect.left,selectedRect.top,
             selectedRect.right,selectedRect.bottom);
@@ -987 +998 @@
                                           controlPos.bottom - controlPos.top,
                                           hwnd,
-                                          (HMENU)NULL,
-                                          (HINSTANCE)NULL,
+                                          NULL,
+                                          NULL,
                                           NULL);
     }
@@ -994 +1005 @@
     {
       SetWindowPos(infoPtr->hwndUpDown,
-                   (HWND)NULL,
+                   NULL,
                    controlPos.left, controlPos.top,
                    controlPos.right - controlPos.left,
@@ -1100 +1111 @@
     /* Take the highest between font or icon */
     if (fontMetrics.tmHeight > icon_height)
-      item_height = fontMetrics.tmHeight;
+      item_height = fontMetrics.tmHeight + 2;
     else
       item_height = icon_height;
@@ -1108 +1119 @@
      * selected item + extra space for the selected item.
      */
-#ifdef __WIN32OS2__
-    //Code below doesn't always work
-    infoPtr->tabHeight = item_height + 2 * VERTICAL_ITEM_PADDING +
-        SELECTED_TAB_OFFSET;
-#else
     infoPtr->tabHeight = item_height + SELECTED_TAB_OFFSET +
                          ((lStyle & TCS_BUTTONS) ? 2 : 1) *
-                          VERTICAL_ITEM_PADDING;
-#endif
+                          infoPtr->uVItemPadding;
+
     TRACE("tabH=%d, tmH=%ld, iconh=%d\n",
           infoPtr->tabHeight, fontMetrics.tmHeight, icon_height);
   }
 
-  TRACE("client right=%d\n", clientRect.right);
+  TRACE("client right=%ld\n", clientRect.right);
 
   for (curItem = 0; curItem < infoPtr->uNumItem; curItem++)
@@ -1132 +1138 @@
       infoPtr->items[curItem].rect.right = infoPtr->items[curItem].rect.left +
                                            infoPtr->tabWidth +
-                                           2 * HORIZONTAL_ITEM_PADDING;
+                                           2 * infoPtr->uHItemPadding;
     }
     else
@@ -1157 +1163 @@
       infoPtr->items[curItem].rect.right = infoPtr->items[curItem].rect.left +
                                            size.cx + icon_width +
-                                           num * HORIZONTAL_ITEM_PADDING;
-      TRACE("for <%s>, l,r=%d,%d, num=%d\n",
+                                           num * infoPtr->uHItemPadding;
+      TRACE("for <%s>, l,r=%ld,%ld, num=%d\n",
           debugstr_w(infoPtr->items[curItem].pszText),
           infoPtr->items[curItem].rect.left,
@@ -1182 +1188 @@
         infoPtr->items[curItem].rect.left = 0;
         curItemRowCount++;
-        TRACE("wrapping <%s>, l,r=%d,%d\n",
+        TRACE("wrapping <%s>, l,r=%ld,%ld\n",
             debugstr_w(infoPtr->items[curItem].pszText),
             infoPtr->items[curItem].rect.left,
@@ -1192 +1198 @@
 
     TRACE("TextSize: %li\n", size.cx);
-    TRACE("Rect: T %i, L %i, B %i, R %i\n",
+    TRACE("Rect: T %li, L %li, B %li, R %li\n",
           infoPtr->items[curItem].rect.top,
           infoPtr->items[curItem].rect.left,
@@ -1256 +1262 @@
           infoPtr->items[iItm].rect.left = 0;
 
-          TRACE("r=%d, cl=%d, cl.r=%d, iCount=%d, iRow=%d, uNumRows=%d, remTab=%d, tabPerRow=%d\n",
+          TRACE("r=%ld, cl=%d, cl.r=%ld, iCount=%d, iRow=%d, uNumRows=%d, remTab=%d, tabPerRow=%d\n",
               infoPtr->items[iItm].rect.right,
               curItemLeftPos, clientRect.right,
@@ -1305 +1311 @@
             curItemLeftPos = infoPtr->items[iItm].rect.right;
 
-          TRACE("arranging <%s>, l,r=%d,%d, row=%d\n",
+          TRACE("arranging <%s>, l,r=%ld,%ld, row=%ld\n",
               debugstr_w(infoPtr->items[iItm].pszText),
               infoPtr->items[iItm].rect.left,
@@ -1353 +1359 @@
               infoPtr->items[iIndex].rect.right += (iCount + 1) * widthDiff;
 
-              TRACE("adjusting 1 <%s>, l,r=%d,%d\n",
+              TRACE("adjusting 1 <%s>, l,r=%ld,%ld\n",
                   debugstr_w(infoPtr->items[iIndex].pszText),
                   infoPtr->items[iIndex].rect.left,
@@ -1366 +1372 @@
           infoPtr->items[iIndexStart].rect.right = clientRect.right - 4;
 
-          TRACE("adjusting 2 <%s>, l,r=%d,%d\n",
+          TRACE("adjusting 2 <%s>, l,r=%ld,%ld\n",
               debugstr_w(infoPtr->items[iIndexStart].pszText),
               infoPtr->items[iIndexStart].rect.left,
@@ -1483 +1489 @@
                      comctl32_color.clrHighlight : comctl32_color.clrBtnText);
 
-  /*
-   * Deflate the rectangle to acount for the padding
-   */
-  if(lStyle & TCS_VERTICAL)
-    InflateRect(drawRect, -VERTICAL_ITEM_PADDING, -HORIZONTAL_ITEM_PADDING);
-  else
-    InflateRect(drawRect, -HORIZONTAL_ITEM_PADDING, -VERTICAL_ITEM_PADDING);
-
 
   /*
@@ -1512 +1510 @@
     dis.itemID     = iItem;
     dis.itemAction = ODA_DRAWENTIRE;
+    dis.itemState = 0;
     if ( iItem == infoPtr->iSelected )
-      dis.itemState = ODS_SELECTED;
-    else
-      dis.itemState = 0;
+      dis.itemState |= ODS_SELECTED;
+    if (infoPtr->uFocus == iItem) 
+      dis.itemState |= ODS_FOCUS;
     dis.hwndItem = hwnd;                /* */
     dis.hDC      = hdc;
-    dis.rcItem   = *drawRect;           /* */
+    CopyRect(&dis.rcItem,drawRect);
     dis.itemData = infoPtr->items[iItem].lParam;
 
@@ -1544 +1543 @@
     RECT rcText;
     INT center_offset;
+
+    /*
+     * Deflate the rectangle to acount for the padding
+     */
+    if(lStyle & TCS_VERTICAL)
+      InflateRect(drawRect, -infoPtr->uVItemPadding, -infoPtr->uHItemPadding);
+    else
+      InflateRect(drawRect, -infoPtr->uHItemPadding, -infoPtr->uVItemPadding);
 
     /* set rcImage to drawRect, we will use top & left in our ImageList_Draw call */
@@ -1573 +1580 @@
 
       if(lStyle & TCS_VERTICAL)
-        center_offset = ((drawRect->bottom - drawRect->top) - (cy + HORIZONTAL_ITEM_PADDING + (rcText.right - rcText.left))) / 2;
+        center_offset = ((drawRect->bottom - drawRect->top) - (cy + infoPtr->uHItemPadding + (rcText.right - rcText.left))) / 2;
       else
-        center_offset = ((drawRect->right - drawRect->left) - (cx + HORIZONTAL_ITEM_PADDING + (rcText.right - rcText.left))) / 2;
-
-      TRACE("for <%s>, c_o=%d, draw=(%d,%d)-(%d,%d), textlen=%d\n",
+        center_offset = ((drawRect->right - drawRect->left) - (cx + infoPtr->uHItemPadding + (rcText.right - rcText.left))) / 2;
+
+      TRACE("for <%s>, c_o=%d, draw=(%ld,%ld)-(%ld,%ld), textlen=%ld\n",
           debugstr_w(infoPtr->items[iItem].pszText), center_offset,
           drawRect->left, drawRect->top, drawRect->right, drawRect->bottom,
@@ -1588 +1595 @@
                                              /* right side of the tab, but the image still uses the left as its x position */
                                              /* this keeps the image always drawn off of the same side of the tab */
-        drawRect->top = rcImage.top + (cx + HORIZONTAL_ITEM_PADDING);
+        drawRect->top = rcImage.top + (cx + infoPtr->uHItemPadding);
       }
       else if(lStyle & TCS_VERTICAL)
@@ -1594 +1601 @@
         rcImage.top = drawRect->bottom - cy - center_offset;
         rcImage.left--;
-        drawRect->bottom = rcImage.top - HORIZONTAL_ITEM_PADDING;
+        drawRect->bottom = rcImage.top - infoPtr->uHItemPadding;
       }
       else /* normal style, whether TCS_BOTTOM or not */
       {
         rcImage.left = drawRect->left + center_offset + 3;
-        drawRect->left = rcImage.left + cx + HORIZONTAL_ITEM_PADDING;
+        drawRect->left = rcImage.left + cx + infoPtr->uHItemPadding;
         rcImage.top -= (lStyle & TCS_BOTTOM) ? 2 : 1;
       }
 
-      TRACE("drawing image=%d, left=%d, top=%d\n",
+      TRACE("drawing image=%d, left=%ld, top=%ld\n",
             infoPtr->items[iItem].iImage, rcImage.left, rcImage.top-1);
       ImageList_Draw
@@ -1861 +1868 @@
           r.left += (1-ZZ);
 
-          TRACE("<left> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n",
+          TRACE("<left> item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n",
                 iItem,
                 fillRect.left,fillRect.top,fillRect.right,fillRect.bottom,
@@ -1905 +1912 @@
           fillRect.right += (1-ZZ);
 
-          TRACE("<left> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n",
+          TRACE("<left> item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n",
                 iItem,
                 fillRect.left,fillRect.top,fillRect.right,fillRect.bottom,
@@ -1962 +1969 @@
           r.top -= ZZ;
 
-          TRACE("<bottom> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n",
+          TRACE("<bottom> item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n",
                 iItem,
                 fillRect.left,fillRect.top,fillRect.right,fillRect.bottom,
@@ -2007 +2014 @@
           fillRect.bottom += (1-ZZ);
 
-          TRACE("<top> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n",
+          TRACE("<top> item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n",
                 iItem,
                 fillRect.left,fillRect.top,fillRect.right,fillRect.bottom,
@@ -2102 +2109 @@
   }
 
-  TRACE("border=(%d,%d)-(%d,%d)\n",
+  TRACE("border=(%ld,%ld)-(%ld,%ld)\n",
         rect.left, rect.top, rect.right, rect.bottom);
 
@@ -2319 +2326 @@
   TAB_INFO* infoPtr)
 {
-  RECT clientRect;
+  RECT clientRect, r;
   DWORD lStyle = GetWindowLongA(hwnd, GWL_STYLE);
   INT lastRow = infoPtr->uNumRows - 1;
@@ -2353 +2360 @@
                       ((lStyle & TCS_BUTTONS) ? lastRow * BUTTON_SPACINGY : 0) + 2;
   }
-
-  TRACE("invalidate (%d,%d)-(%d,%d)\n",
+  
+  /* Punch out the updown control */
+  if (infoPtr->needsScrolling && (clientRect.right > 0)) {
+    GetClientRect(infoPtr->hwndUpDown, &r);
+    clientRect.right = clientRect.right - (r.right - r.left);
+  }
+  
+  TRACE("invalidate (%ld,%ld)-(%ld,%ld)\n",
         clientRect.left,clientRect.top,
         clientRect.right,clientRect.bottom);
+ 
   InvalidateRect(hwnd, &clientRect, TRUE);
 }
@@ -2368 +2382 @@
   hdc = wParam== 0 ? BeginPaint (hwnd, &ps) : (HDC)wParam;
 
-  TRACE("erase %d, rect=(%d,%d)-(%d,%d)\n",
+  TRACE("erase %d, rect=(%ld,%ld)-(%ld,%ld)\n",
         ps.fErase,
         ps.rcPaint.left,ps.rcPaint.top,ps.rcPaint.right,ps.rcPaint.bottom);
@@ -2392 +2406 @@
 
   GetClientRect (hwnd, &rect);
-  TRACE("Rect: %p T %i, L %i, B %i, R %i\n", hwnd,
+  TRACE("Rect: %p T %li, L %li, B %li, R %li\n", hwnd,
         rect.top, rect.left, rect.bottom, rect.right);
 
@@ -2467 +2481 @@
 
   GetClientRect (hwnd, &rect);
-  TRACE("Rect: %p T %i, L %i, B %i, R %i\n", hwnd,
+  TRACE("Rect: %p T %li, L %li, B %li, R %li\n", hwnd,
         rect.top, rect.left, rect.bottom, rect.right);
 
@@ -2543 +2557 @@
   {
     lResult = MAKELONG(infoPtr->tabWidth, infoPtr->tabHeight);
-    infoPtr->tabWidth = (INT)LOWORD(lParam);
-    infoPtr->tabHeight = (INT)HIWORD(lParam);
+    /* UNDOCUMENTED: If requested Width or Height is 0 this means that program wants to use default. */    
+    if (LOWORD(lParam)) infoPtr->tabWidth = (INT)LOWORD(lParam);
+    if (HIWORD(lParam)) infoPtr->tabHeight = (INT)HIWORD(lParam);
     TRACE("was h=%d,w=%d, now h=%d,w=%d\n",
           HIWORD(lResult), LOWORD(lResult),
@@ -2899 +2914 @@
   infoPtr->uNumItem        = 0;
   infoPtr->uNumRows        = 0;
+  infoPtr->uHItemPadding   = 6;
+  infoPtr->uVItemPadding   = 3;
   infoPtr->hFont           = 0;
   infoPtr->items           = 0;
@@ -2959 +2976 @@
   infoPtr->tabHeight = fontMetrics.tmHeight + SELECTED_TAB_OFFSET +
                        ((dwStyle & TCS_BUTTONS) ? 2 : 1) *
-                        VERTICAL_ITEM_PADDING;
+                        infoPtr->uVItemPadding;
 
   /* Initialize the width of a tab. */
@@ -3073 +3090 @@
 
     case TCM_SETPADDING:
-      FIXME("Unimplemented msg TCM_SETPADDING\n");
-      return 0;
+      return TAB_SetPadding (hwnd, wParam, lParam);
 
     case TCM_GETROWCOUNT:
@@ -3202 +3218 @@
   wndClass.cbWndExtra    = sizeof(TAB_INFO *);
   wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
-  wndClass.hbrBackground = (HBRUSH)NULL;
+  wndClass.hbrBackground = NULL;
   wndClass.lpszClassName = WC_TABCONTROLA;
 
@@ -3212 +3228 @@
 TAB_Unregister (void)
 {
-    UnregisterClassA (WC_TABCONTROLA, (HINSTANCE)NULL);
-}
+    UnregisterClassA (WC_TABCONTROLA, NULL);
+}