X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=instimg;a=blobdiff_plain;f=src%2Fwidgets.c;h=2d37973c7101c5a2480b74affb7e93a94e51e108;hp=82e49339f3577975543d9e3a7d6e13921daf7576;hb=5890e34dc52247c2ed4b9ae2f6cd5e534e3d369f;hpb=2b81b3a8c033e3ac58c746c928be1c1de1408597

diff --git a/src/widgets.c b/src/widgets.c
index 82e4933..2d37973 100644
--- a/src/widgets.c
+++ b/src/widgets.c
@@ -294,15 +294,26 @@ static void combosize(struct wgt_window *win, HWND cbwnd, const char **items, in
 	wgt_string_size(win, "00", &textsz);
 	max_width = width < 0 && width != WGT_AUTO ? -width : textsz.width;
 
+	/* first get the height of the editbox */
 	sum_height = SendMessage(cbwnd, CB_GETITEMHEIGHT, -1, 0);
 	sz->y = sum_height;
-
-	for(i=0; i<num_items; i++) {
-		wgt_string_size(win, items[i], &textsz);
-		if(textsz.width > max_width) max_width = textsz.width;
-		sum_height += SendMessage(cbwnd, CB_GETITEMHEIGHT, i, 0);
+	/* then add the height of the dropdown list items */
+	/* XXX I can't figure out why, but it's not sufficient to show all items
+	 * without some more height, so let's double it...
+	 */
+	sum_height *= 2;
+	sum_height += SendMessage(cbwnd, CB_GETITEMHEIGHT, 0, 0) * num_items;
+	sum_height += GetSystemMetrics(SM_CYEDGE) * 2;
+
+	if(width < 0) {
+		int sbar_width;
+		for(i=0; i<num_items; i++) {
+			wgt_string_size(win, items[i], &textsz);
+			if(textsz.width > max_width) max_width = textsz.width;
+		}
+		sbar_width = GetSystemMetrics(SM_CXVSCROLL);
+		width = max_width + sbar_width + GetSystemMetrics(SM_CXEDGE) * 2;
 	}
-	if(width < 0) width = max_width * 3 / 2;
 	if(height < 0) height = sum_height;
 
 	sz->width = width;
@@ -344,7 +355,6 @@ struct wgt_widget *wgt_combo(struct wgt_window *win, const char **items, int num
 		SendMessage(w->handle, CB_SETCURSEL, sel, 0);
 	}
 
-
 	w->cb_modify = modfunc;
 	w->next = win->wlist;
 	win->wlist = w;
@@ -402,6 +412,8 @@ int wgt_combo_setitems(struct wgt_widget *w, const char **items, int num_items)
 
 	combosize(w->win, w->handle, items, num_items, w->rect.width, WGT_AUTO, &size);
 	MoveWindow(w->handle, w->rect.x, w->rect.y, w->rect.width, size.height, TRUE);
+
+	SendMessage(w->handle, CB_SETCURSEL, 0, 0);
 	return 0;
 }