add clip folders, icon margins, fix safe regions, update neophyte, fix folder edl...

[goodguy/history.git] / cinelerra-5.1 / guicast / bclistbox.C

diff --git a/cinelerra-5.1/guicast/bclistbox.C b/cinelerra-5.1/guicast/bclistbox.C
index d983c7ac8cc22cd3526b2a875e3a06ed47f30296..16a477bbe309d0de365f9029675516f61a3f2487 100644 (file)
--- a/cinelerra-5.1/guicast/bclistbox.C
+++ b/cinelerra-5.1/guicast/bclistbox.C
@@ -656,8 +656,8 @@ void BC_ListBox::calculate_item_coords_recursive(
        if( temp_display_format == LISTBOX_ICON_LIST ) {
                for( int i=0; i<data[0].size(); ++i ) {
                        if( data[0].get(i)->icon ) {
-                               if( data[0].get(i)->icon->get_h() > row_height )
-                                       row_height = data[0].get(i)->icon->get_h();
+                               int icon_h = data[0].get(i)->icon->get_h() + 2*ICON_MARGIN;
+                               if( row_height < icon_h ) row_height = icon_h;
                        }
                }
        }
@@ -1173,10 +1173,10 @@ int BC_ListBox::get_icon_mask(BC_ListBoxItem *item,
        case LISTBOX_ICONS:
        case LISTBOX_ICONS_PACKED:
        case LISTBOX_ICON_LIST: {
-               x = get_item_x(item);
-               y = get_item_y(item);
-               w = get_icon_w(item) + ICON_MARGIN * 2;
-               h = get_icon_h(item) + ICON_MARGIN * 2;
+               x = get_item_x(item) + ICON_MARGIN;
+               y = get_item_y(item) + ICON_MARGIN;
+               w = get_icon_w(item) + ICON_MARGIN;
+               h = get_icon_h(item) + ICON_MARGIN;
                break; }
        case LISTBOX_TEXT:
        default: {