Changeset 500 for trunk/src/user32/new/combo.cpp

Timestamp:

Aug 15, 1999, 9:11:02 PM (26 years ago)

Author:

cbratschi

Message:

wine-990731 update

File:

• trunk/src/user32/new/combo.cpp (modified) (8 diffs)

trunk/src/user32/new/combo.cpp

@@ -1 @@
-/* $Id: combo.cpp,v 1.2 1999-07-24 17:10:24 cbratschi Exp $ */
+/* $Id: combo.cpp,v 1.3 1999-08-15 19:11:00 cbratschi Exp $ */
 /*
  * Combo controls
@@ -39 +39 @@
  * Look and feel dependant "constants"
  */
+#define COMBO_YBORDERGAP         5
 #define COMBO_XBORDERSIZE()      ( 2 )
 #define COMBO_YBORDERSIZE()      ( 2 )
@@ -484 +485 @@
   if( lphc->owner || !(lpcs->style & WS_VISIBLE) )
   {
-      UINT      lbeStyle;
+      UINT lbeStyle   = 0;
+      UINT lbeExStyle = 0;
 
       /*
@@ -530 +532 @@
         lbeStyle |= LBS_DISABLENOSCROLL;
 
-      if( CB_GETTYPE(lphc) == CBS_SIMPLE )      /* child listbox */
-        lbeStyle |= WS_CHILD | WS_VISIBLE;
-      else                                      /* popup listbox */
-        lbeStyle |= WS_POPUP;
+      if( CB_GETTYPE(lphc) == CBS_SIMPLE )      /* child listbox */
+      {
+        lbeStyle |= WS_CHILD | WS_VISIBLE;
+
+        /*
+         * In win 95 look n feel, the listbox in the simple combobox has
+         * the WS_EXCLIENTEDGE style instead of the WS_BORDER style.
+         */
+        lbeStyle   &= ~WS_BORDER;
+        lbeExStyle |= WS_EX_CLIENTEDGE;
+      }
+      else                                      /* popup listbox */
+        lbeStyle |= WS_POPUP;
 
      /* Dropdown ComboLBox is not a child window and we cannot pass
       * ID_CB_LISTBOX directly because it will be treated as a menu handle.
       */
-      lphc->hWndLBox = CreateWindowExA(0,
+      lphc->hWndLBox = CreateWindowExA(lbeExStyle,
                                        clbName,
                                        NULL,
@@ -1063 +1074 @@
 {
    RECT rect;
+   int nItems = 0;
+   int i;
+   int nHeight;
+   int nDroppedHeight;
 
    //TRACE("[%04x]: drop down\n", CB_HWND(lphc));
@@ -1091 +1106 @@
    /* now set popup position */
    GetWindowRect( lphc->hwndself, &rect );
-
 
    /*
@@ -1099 +1113 @@
      rect.left += COMBO_EDITBUTTONSPACE();
 
+   /* if the dropped height is greater than the total height of the dropped
+     items list, then force the drop down list height to be the total height
+     of the items in the dropped list */
+
+   nDroppedHeight = lphc->droppedRect.bottom - lphc->droppedRect.top;
+   nItems = (int)SendMessageA (lphc->hWndLBox, LB_GETCOUNT, 0, 0);
+   nHeight = COMBO_YBORDERGAP;
+   for (i = 0; i < nItems; i++)
+   {
+     nHeight += (int)SendMessageA (lphc->hWndLBox, LB_GETITEMHEIGHT, i, 0);
+
+     if (nHeight >= nDroppedHeight)
+       break;
+   }
+
+   if (nHeight < nDroppedHeight)
+      nDroppedHeight = nHeight;
+
    SetWindowPos( lphc->hWndLBox, HWND_TOP, rect.left, rect.bottom,
-                 lphc->droppedRect.right - lphc->droppedRect.left,
-                 lphc->droppedRect.bottom - lphc->droppedRect.top,
-                 SWP_NOACTIVATE | SWP_NOREDRAW);
+                 lphc->droppedRect.right - lphc->droppedRect.left,
+                 nDroppedHeight,
+                 SWP_NOACTIVATE | SWP_NOREDRAW);
+
 
    if( !(lphc->wState & CBF_NOREDRAW) )
@@ -1127 +1160 @@
        //TRACE("[%04x]: roll up [%i]\n", CB_HWND(lphc), (INT)ok );
 
-       /*
-        * It seems useful to send the WM_LBUTTONUP with (-1,-1) when cancelling
-        * and with (0,0) (anywhere in the listbox) when Oking.
-        */
-       SendMessageA( lphc->hWndLBox, WM_LBUTTONUP, 0, ok ? (LPARAM)0 : (LPARAM)(-1) );
-
        if( lphc->wState & CBF_DROPPED )
        {
            RECT rect;
+
+           /*
+            * It seems useful to send the WM_LBUTTONUP with (-1,-1) when cancelling
+            * and with (0,0) (anywhere in the listbox) when Oking.
+            */
+           SendMessageA( lphc->hWndLBox, WM_LBUTTONUP, 0, ok ? (LPARAM)0 : (LPARAM)(-1) );
 
            lphc->wState &= ~CBF_DROPPED;