commit cef12530ebcb6d73796ec6b48c9749edfa13da0a
author Gerard Patel <g.patel@wanadoo.fr> Tue Aug 01 20:48:40 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Aug 01 20:48:40 2000 +0000
tree 59795918b8c375971f7884ec592ffaca03d271f5
parent 3c41fabc6a618f258341e4e9d86b283b186707ac

Change logic of listbox resizing for 16 bits apps for lists without
LBS_NOINTEGRALHEIGHT style.

controls/listbox.c

diff --git a/controls/listbox.c b/controls/listbox.c
index de53175..4f489cb 100644
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -348,16 +348,23 @@
     descr->height = rect.bottom - rect.top;
     if (!(descr->style & LBS_NOINTEGRALHEIGHT) && !(descr->style & LBS_OWNERDRAWVARIABLE))
     {
-        if ((descr->height > descr->item_height) &&
-            (descr->height % descr->item_height))
+        UINT remaining = descr->height % descr->item_height;
+        if ((descr->height > descr->item_height) && remaining)
         {
+            if (!(wnd->flags & WIN_ISWIN32))
+            { /* give a margin for error to 16 bits programs - if we need
+                 less than the height of the nonclient area, round to the
+                 *next* number of items */ 
+                int ncheight = wnd->rectWindow.bottom - wnd->rectWindow.top - descr->height;
+                if ((descr->item_height - remaining) <= ncheight)
+                    remaining = remaining - descr->item_height;
+            }
             TRACE("[%04x]: changing height %d -> %d\n",
 			 wnd->hwndSelf, descr->height,
-			 descr->height - descr->height%descr->item_height );
+			 descr->height - remaining );
             SetWindowPos( wnd->hwndSelf, 0, 0, 0,
                             wnd->rectWindow.right - wnd->rectWindow.left,
-                            wnd->rectWindow.bottom - wnd->rectWindow.top -
-                                (descr->height % descr->item_height),
+                            wnd->rectWindow.bottom - wnd->rectWindow.top - remaining,
                             SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOMOVE );
             return;
         }