-
- 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;