X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fguicast%2Fbclistbox.C;h=882c378be96f2bab80cb01c1b700aeda152b5706;hb=fee54016102a7a59d2181c8f16a7f2562f68540d;hp=88d4b09470a8337a470f11f664f26b9e7edbf945;hpb=5f167e2ecbd68f818d1655ae02ae98e978fdd254;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/bclistbox.C b/cinelerra-5.1/guicast/bclistbox.C
index 88d4b094..882c378b 100644
--- a/cinelerra-5.1/guicast/bclistbox.C
+++ b/cinelerra-5.1/guicast/bclistbox.C
@@ -1061,7 +1061,7 @@ int BC_ListBox::get_text_w(BC_ListBoxItem *item)
 int BC_ListBox::get_text_h(BC_ListBoxItem *item)
 {
 	int h = item->get_text_h();
-	if( h < 0 ) item->set_text_h(h = get_text_height(MEDIUMFONT));
+	if( h < 0 ) item->set_text_h(h = get_text_height(MEDIUMFONT, item->get_text()));
 	return h;
 }
 
@@ -1362,6 +1362,8 @@ int BC_ListBox::get_text_mask(BC_ListBoxItem *item,
 	{
 		w = get_text_width(MEDIUMFONT, item->text) + LISTBOX_MARGIN * 2;
 		h = row_height;
+		int ih = get_icon_h(item);
+		if( h < ih ) h = ih;
 	}
 	return 0;
 }
@@ -4404,9 +4406,14 @@ void BC_ListBox::draw_text_recursive(ArrayList<BC_ListBoxItem*> *data,
 				gui->set_color(row_color);
 				gui->draw_box(x, y, column_width, h);
 				gui->set_color(BLACK);
-				int yy = y, xx = x + column_width-1;
-				gui->draw_line(x, yy, xx, yy);
-				yy = y + row_height;
+				int xx = x + column_width-1;
+				gui->draw_line(x, y, xx, y);
+				int hh = row_height;
+				if( display_format == LISTBOX_ICON_LIST ) {
+					int ih = get_icon_h(item);
+					if( ih > hh ) hh = ih;
+				}
+				int yy = y + hh-1;
 				gui->draw_line(x, yy, xx, yy);
 			}