If we have no dropdown height give ourselves a minimum height of 5

items or max items (whichever is less).

If we have no dropdown height give ourselves a minimum height of 5
acb308af · Aric Stewart · Alexandre Julliard · 0393d43c · acb308af
Commit acb308af authored Aug 28, 2002 by Aric Stewart Committed by Alexandre Julliard Aug 28, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

combo.c controls/combo.c +12 -2

No files found.
--- a/controls/combo.c
+++ b/controls/combo.c
@@ -1195,12 +1195,22 @@ static void CBDropDown( LPHEADCOMBO lphc )
   if (nItems > 0)
   {
      int nHeight;
+      int nIHeight;

-      nHeight = (int)SendMessageW(lphc->hWndLBox, LB_GETITEMHEIGHT, 0, 0);
-      nHeight *= nItems;
+      nIHeight = (int)SendMessageW(lphc->hWndLBox, LB_GETITEMHEIGHT, 0, 0);
+
+      nHeight = nIHeight*nItems;

      if (nHeight < nDroppedHeight - COMBO_YBORDERSIZE())
         nDroppedHeight = nHeight + COMBO_YBORDERSIZE();
+
+      if (nDroppedHeight < nIHeight)
+      {
+            if (nItems < 5)
+                nDroppedHeight = nHeight;
+            else
+                nDroppedHeight = 5*nIHeight;
+      }
   }

   /*If height of dropped rectangle gets beyond a screen size it should go up, otherwise down.*/