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

Timestamp:

Aug 28, 1999, 11:25:56 AM (26 years ago)

Author:

achimha

Message:

merged with latest WINE changes

File:

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

trunk/src/comctl32/tab.c

@@ -1 @@
-/* $Id: tab.c,v 1.11 1999-08-21 12:10:02 cbratschi Exp $ */
+/* $Id: tab.c,v 1.12 1999-08-28 09:25:56 achimha Exp $ */
 /*
  * Tab control
@@ -12 +12 @@
  *  Image list support
  *  Multiline support
+ *  Unicode support
  */
+
+/* WINE 990815 level */
 
 #include <string.h>
@@ -643 +646 @@
    * a font.
    */
-  hdc = GetDC(hwnd);
-
+  hdc = GetDC(hwnd); 
+    
   hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT);
   hOldFont = SelectObject (hdc, hFont);
@@ -653 +656 @@
    */
   GetClientRect(hwnd, &clientRect);
-
+  
   /*
    * The leftmost item will be "0" aligned
@@ -661 +664 @@
   if (!((lStyle & TCS_FIXEDWIDTH) || (lStyle & TCS_OWNERDRAWFIXED)))
   {
+    int item_height;
+    int icon_height = 0;
+
     /*
      * Use the current font to determine the height of a tab.
@@ -667 +673 @@
 
     /*
-     * Make sure there is enough space for the letters + growing the
-     * selected item + extra space for the selected item.
-     */
-    infoPtr->tabHeight = fontMetrics.tmHeight + 2*VERTICAL_ITEM_PADDING +
+     * Get the icon height
+     */
+    if (infoPtr->himl)
+      ImageList_GetIconSize(infoPtr->himl, 0, &icon_height);
+
+    /*
+     * Take the highest between font or icon
+     */
+    if (fontMetrics.tmHeight > icon_height)
+      item_height = fontMetrics.tmHeight;
+    else
+      item_height = icon_height;
+
+    /*
+     * Make sure there is enough space for the letters + icon + growing the 
+     * selected item + extra space for the selected item.   
+     */
+    infoPtr->tabHeight = item_height + 2*VERTICAL_ITEM_PADDING +  
       SELECTED_TAB_OFFSET;
   }
@@ -679 +699 @@
      * Calculate the vertical position of the tab
      */
-    if (lStyle & TCS_BOTTOM)
-    {
-      infoPtr->items[curItem].rect.bottom = clientRect.bottom -
+    if (lStyle & TCS_BOTTOM) 
+    {
+      infoPtr->items[curItem].rect.bottom = clientRect.bottom - 
                                             SELECTED_TAB_OFFSET;
-      infoPtr->items[curItem].rect.top = clientRect.bottom -
+      infoPtr->items[curItem].rect.top = clientRect.bottom - 
                                          infoPtr->tabHeight;
     }
-    else
-    {
-      infoPtr->items[curItem].rect.top = clientRect.top +
+    else 
+    {
+      infoPtr->items[curItem].rect.top = clientRect.top + 
                                          SELECTED_TAB_OFFSET;
-      infoPtr->items[curItem].rect.bottom = clientRect.top +
+      infoPtr->items[curItem].rect.bottom = clientRect.top + 
                                             infoPtr->tabHeight;
     }
@@ -707 +727 @@
     else
     {
+      int icon_width  = 0;
+      int num = 2;
+
       /*
        * Calculate how wide the tab is depending on the text it contains
        */
-      GetTextExtentPoint32W(hdc, infoPtr->items[curItem].pszText,
-                            lstrlenW(infoPtr->items[curItem].pszText), &size);
+      GetTextExtentPoint32A(hdc, infoPtr->items[curItem].pszText, 
+                            lstrlenA(infoPtr->items[curItem].pszText), &size);
+
+      /*
+       * Add the icon width
+       */
+      if (infoPtr->himl)
+      {
+        ImageList_GetIconSize(infoPtr->himl, &icon_width, 0);
+        num++;
+      }
 
       infoPtr->items[curItem].rect.right = infoPtr->items[curItem].rect.left +
-                                           size.cx + 2*HORIZONTAL_ITEM_PADDING;
-    }
-
-//    TRACE(tab, "TextSize: %i\n ", size.cx);
-//    TRACE(tab, "Rect: T %i, L %i, B %i, R %i\n",
-//        infoPtr->items[curItem].rect.top,
-//        infoPtr->items[curItem].rect.left,
-//        infoPtr->items[curItem].rect.bottom,
-//        infoPtr->items[curItem].rect.right);
+                                           size.cx + icon_width + 
+                                           num*HORIZONTAL_ITEM_PADDING;
+    }
+
+//    TRACE("TextSize: %i\n ", size.cx);
+//    TRACE("Rect: T %i, L %i, B %i, R %i\n", 
+//        infoPtr->items[curItem].rect.top,
+//        infoPtr->items[curItem].rect.left,
+//        infoPtr->items[curItem].rect.bottom,
+//        infoPtr->items[curItem].rect.right);  
 
     /*
@@ -737 +770 @@
    * Check if we need a scrolling control.
    */
-  infoPtr->needsScrolling = (curItemLeftPos + (2*SELECTED_TAB_OFFSET) >
+  infoPtr->needsScrolling = (curItemLeftPos + (2*SELECTED_TAB_OFFSET) > 
                              clientRect.right);
 
-  TAB_SetupScrolling(hwnd, infoPtr, &clientRect);
-
+  TAB_SetupScrolling(hwnd, infoPtr, &clientRect);      
+  
   /*
    * Cleanup
@@ -933 +966 @@
                       r.left, r.top+1, ILD_NORMAL);
       ImageList_GetIconSize (infoPtr->himl, &cx, &cy);
-      r.left+=cx;
+      r.left+=(cx + HORIZONTAL_ITEM_PADDING);
     }
 
@@ -1398 +1431 @@
 }
 
-static LRESULT
+static LRESULT 
 TAB_SetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
-  TCITEMA *tabItem;
-  TAB_ITEM *wineItem;
+  TCITEMA *tabItem; 
+  TAB_ITEM *wineItem; 
   INT    iItem,len;
 
   iItem=(INT) wParam;
   tabItem=(LPTCITEMA ) lParam;
-//  TRACE (tab,"%d %p\n",iItem, tabItem);
+//  TRACE("%d %p\n",iItem, tabItem);
   if ((iItem<0) || (iItem>infoPtr->uNumItem)) return FALSE;
 
@@ -1419 +1452 @@
     wineItem->lParam=tabItem->lParam;
 
-//  if (tabItem->mask & TCIF_RTLREADING)
-//    FIXME (tab,"TCIF_RTLREADING\n");
-
-  if (tabItem->mask & TCIF_STATE)
+//  if (tabItem->mask & TCIF_RTLREADING) 
+//    FIXME("TCIF_RTLREADING\n");
+
+  if (tabItem->mask & TCIF_STATE) 
     wineItem->dwState=tabItem->dwState;
 
   if (tabItem->mask & TCIF_TEXT) {
-   len = lstrlenA (tabItem->pszText);
-   if (len>wineItem->cchTextMax)
-     wineItem->pszText = COMCTL32_ReAlloc (wineItem->pszText, (len+1)*sizeof(WCHAR));
-   lstrcpyAtoW (wineItem->pszText, tabItem->pszText);
-  }
+   len=lstrlenA (tabItem->pszText);
+   if (len>wineItem->cchTextMax) 
+     wineItem->pszText= COMCTL32_ReAlloc (wineItem->pszText, len+1);
+   lstrcpyA (wineItem->pszText, tabItem->pszText);
+  }
+
+  /*
+   * Update and repaint tabs.
+   */
+  TAB_SetItemBounds(hwnd);
+  TAB_InvalidateTabArea(hwnd,infoPtr);
 
   return TRUE;