Aric Stewart : user32: Make sure there is space for at least 6 items in a combo dropdown without forcing it to be at most 6 items as well .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d0cf2342df427afa6d0c5f367f83b55f578e56e4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d0cf2342df427afa6d0c5f367f...

Author: Aric Stewart <aric(a)codeweavers.com>
Date:   Fri Apr 11 09:07:31 2008 -0500

user32: Make sure there is space for at least 6 items in a combo dropdown without forcing it to be at most 6 items as well.

---

 dlls/user32/combo.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c
index 14eebe8..0e66b7d 100644
--- a/dlls/user32/combo.c
+++ b/dlls/user32/combo.c
@@ -1107,7 +1107,7 @@ static void CBDropDown( LPHEADCOMBO lphc )
       {
             if (nItems < 5)
                 nDroppedHeight = (nItems+1)*nIHeight;
-            else
+            else if (nDroppedHeight < 6*nIHeight)
                 nDroppedHeight = 6*nIHeight;
       }
    }