X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbclistbox.C;h=16a477bbe309d0de365f9029675516f61a3f2487;hp=7c032b6a0bbb9b31cde88505fd9d8da70864c9e0;hb=a95193c3fd88733d184f2d460eca1fe6ddf8af28;hpb=20002b54e92573aafc97cbc3a85ec529b35bb191 diff --git a/cinelerra-5.1/guicast/bclistbox.C b/cinelerra-5.1/guicast/bclistbox.C index 7c032b6a..16a477bb 100644 --- a/cinelerra-5.1/guicast/bclistbox.C +++ b/cinelerra-5.1/guicast/bclistbox.C @@ -369,6 +369,7 @@ BC_ListBox::BC_ListBox(int x, int y, int w, int h, drag_cursor_x = 0; drag_column_w = 0; temp_display_format = display_format; + packed_icons = display_format == LISTBOX_ICONS_PACKED ? 1 : 0; rect_x1 = rect_x2 = 0; rect_y1 = rect_y2 = 0; @@ -655,8 +656,8 @@ void BC_ListBox::calculate_item_coords_recursive( if( temp_display_format == LISTBOX_ICON_LIST ) { for( int i=0; iicon ) { - 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; } } } @@ -708,7 +709,7 @@ void BC_ListBox::calculate_item_coords_recursive( int bl = get_baseline(item); if( bl > row_ascent ) row_ascent = bl; int dt = ht - bl; - if( dt > row_descent ) row_ascent = bl; + if( dt > row_descent ) row_descent = dt; // printf("BC_ListBox::calculate_item_coords_recursive %p %d %d %d %d %s \n", // item->get_sublist(), item->get_columns(), item->get_expand(), @@ -851,25 +852,38 @@ int BC_ListBox::get_highlighted_item() int BC_ListBox::get_item_x(BC_ListBoxItem *item) { - if( display_format == LISTBOX_TEXT ) + switch( display_format ) { + case LISTBOX_TEXT: + case LISTBOX_ICON_LIST: return item->text_x - xposition + 2; - if( display_format == LISTBOX_ICON_LIST ) - return item->text_x - xposition + 2; - return item->icon_x - xposition + 2; + case LISTBOX_ICONS: + case LISTBOX_ICONS_PACKED: + return item->icon_x - xposition + 2; + } + return 0; } int BC_ListBox::get_item_y(BC_ListBoxItem *item) { - if( display_format == LISTBOX_TEXT ) + switch( display_format ) { + case LISTBOX_TEXT: + case LISTBOX_ICON_LIST: return item->text_y - yposition + title_h + 2; - if( display_format == LISTBOX_ICON_LIST ) - return item->text_y - yposition + title_h + 2; - return item->icon_y - yposition + title_h + 2; + case LISTBOX_ICONS: + case LISTBOX_ICONS_PACKED: + return item->icon_y - yposition + 2; + } + return 0; } int BC_ListBox::get_item_w(BC_ListBoxItem *item) { - if( display_format == LISTBOX_ICONS ) { + switch( display_format ) { + case LISTBOX_TEXT: + case LISTBOX_ICON_LIST: { + return get_text_w(item) + 2 * LISTBOX_MARGIN; } + case LISTBOX_ICONS: + case LISTBOX_ICONS_PACKED: { int x, y, w, h; get_icon_mask(item, x, y, w, h); int icon_w = w; @@ -878,13 +892,19 @@ int BC_ListBox::get_item_w(BC_ListBoxItem *item) return icon_position == ICON_LEFT ? icon_w + text_w : icon_w > text_w ? icon_w : text_w; + } } - return get_text_w(item) + 2 * LISTBOX_MARGIN; + return 0; } int BC_ListBox::get_item_h(BC_ListBoxItem *item) { - if( display_format == LISTBOX_ICONS ) { + switch( display_format ) { + case LISTBOX_TEXT: + case LISTBOX_ICON_LIST: + return get_text_h(item); + case LISTBOX_ICONS: + case LISTBOX_ICONS_PACKED: { int x, y, w, h; get_icon_mask(item, x, y, w, h); int icon_h = h; @@ -892,9 +912,9 @@ int BC_ListBox::get_item_h(BC_ListBoxItem *item) int text_h = h; return icon_position != ICON_LEFT ? icon_h + text_h : - icon_h > text_h ? icon_h : text_h; + icon_h > text_h ? icon_h : text_h; } } - return get_text_h(item); + return 0; } @@ -931,9 +951,12 @@ int BC_ListBox::get_baseline(BC_ListBoxItem *item) int BC_ListBox::get_items_width() { - int widest = 0; - - if( display_format == LISTBOX_ICONS ) { + switch( display_format ) { + case LISTBOX_TEXT: + return get_column_offset(columns); + case LISTBOX_ICONS: + case LISTBOX_ICONS_PACKED: { + int widest = 0; for( int i=0; i widest ) widest = x1 + w; - if( display_format == LISTBOX_ICONS && icon_position == ICON_LEFT ) + if( icon_position == ICON_LEFT ) x1 += w; get_text_mask(item, x, y, w, h); if( x1 + w > widest ) widest = x1 + w; } } - } - else - if( display_format == LISTBOX_TEXT ) { + return widest; } + case LISTBOX_ICON_LIST: return get_column_offset(columns); } - else { - return get_column_offset(columns); - } - return widest; + return 0; } int BC_ListBox::get_items_height(ArrayList *data, int columns, @@ -976,15 +995,8 @@ int BC_ListBox::get_items_height(ArrayList *data, int columns, int x, y, w, h; BC_ListBoxItem *item = data[master_column].values[j]; - if( display_format == LISTBOX_ICONS || - display_format == LISTBOX_ICON_LIST ) { - get_icon_mask(item, x, y, w, h); - if( y + h + yposition > highest ) highest = y + h + yposition; - - get_text_mask(item, x, y, w, h); - if( y + h + yposition > highest ) highest = y + h + yposition; - } - else { + switch( display_format ) { + case LISTBOX_TEXT: get_text_mask(item, x, y, w, h); *result += h; // Descend into sublist @@ -993,6 +1005,16 @@ int BC_ListBox::get_items_height(ArrayList *data, int columns, item->get_columns(), result); } + break; + case LISTBOX_ICONS: + case LISTBOX_ICONS_PACKED: + case LISTBOX_ICON_LIST: + get_icon_mask(item, x, y, w, h); + if( y + h + yposition > highest ) highest = y + h + yposition; + + get_text_mask(item, x, y, w, h); + if( y + h + yposition > highest ) highest = y + h + yposition; + break; } } @@ -1147,14 +1169,20 @@ int BC_ListBox::get_column_width(int column, int clamp_right) int BC_ListBox::get_icon_mask(BC_ListBoxItem *item, int &x, int &y, int &w, int &h) { - if( display_format == LISTBOX_ICONS ) { - 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; - } - else + switch( display_format ) { + case LISTBOX_ICONS: + case LISTBOX_ICONS_PACKED: + case LISTBOX_ICON_LIST: { + 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: { x = y = w = h = 0; + break; } + } return 0; } @@ -1164,7 +1192,13 @@ int BC_ListBox::get_text_mask(BC_ListBoxItem *item, x = get_item_x(item); y = get_item_y(item); - if( display_format == LISTBOX_ICONS ) { + switch( display_format ) { + case LISTBOX_TEXT: { + w = get_text_w(item) + LISTBOX_MARGIN * 2; + h = get_text_h(item); + break; } + case LISTBOX_ICONS: + case LISTBOX_ICONS_PACKED: { if( icon_position == ICON_LEFT ) { x += get_icon_w(item) + ICON_MARGIN * 2; y += get_icon_h(item) - get_text_h(item); @@ -1173,19 +1207,17 @@ int BC_ListBox::get_text_mask(BC_ListBoxItem *item, y += get_icon_h(item) + ICON_MARGIN; } - w = get_text_w(item) + ICON_MARGIN * 2; + w = packed_icons ? + get_icon_w(item) + ICON_MARGIN * 4 : + get_text_w(item) + ICON_MARGIN * 2 ; h = get_text_h(item) + ICON_MARGIN * 2; - } - else - if( display_format == LISTBOX_TEXT ) { - w = get_text_w(item) + LISTBOX_MARGIN * 2; - h = get_text_h(item); - } - else { + break; } + case LISTBOX_ICON_LIST: { w = get_text_width(MEDIUMFONT, item->text) + LISTBOX_MARGIN * 2; h = row_height; - int ih = get_icon_h(item); - if( h < ih ) h = ih; + break; } + default: + w = h = 0; } return 0; } @@ -1581,9 +1613,9 @@ int BC_ListBox::center_selection(int selection, BC_ListBoxItem *item = data[master_column].values[i]; if( (*counter) == selection ) { BC_ListBoxItem *top_item = this->data[master_column].values[0]; - - - if( display_format == LISTBOX_ICONS ) { + switch( display_format ) { + case LISTBOX_ICONS: + case LISTBOX_ICONS_PACKED: { // Icon is out of window if( item->icon_y-yposition > view_h-get_text_h(item) || item->icon_y-yposition < 0 ) { @@ -1594,14 +1626,13 @@ int BC_ListBox::center_selection(int selection, data[master_column].values[selection]->icon_x - xposition < 0 ) { xposition = item->icon_x - view_w / 2; } - } - else { + break; } + case LISTBOX_TEXT: + case LISTBOX_ICON_LIST: // Text coordinate is out of window if( item->text_y-yposition > view_h-get_text_h(item) || item->text_y-yposition < 0 ) { - yposition = item->text_y - - top_item->text_y - - view_h / 2; + yposition = item->text_y - top_item->text_y - view_h / 2; } } return 1; @@ -1849,7 +1880,9 @@ int BC_ListBox::select_rectangle(ArrayList *data, for( int i=0; i *data, result = 1; } } - } - else { + break; } + case LISTBOX_TEXT: + case LISTBOX_ICON_LIST: { if( x2 >= 0 && x1 < (yscrollbar ? gui->get_w() - get_resources()->vscroll_data[SCROLL_HANDLE_UP]->get_w() : @@ -1889,6 +1923,7 @@ int BC_ListBox::select_rectangle(ArrayList *data, result = 1; } } + break; } } } @@ -2039,8 +2074,11 @@ int BC_ListBox::get_cursor_item(ArrayList *data, int cursor_x, if( !counter ) counter = &temp; // Icons are not treed - if( display_format == LISTBOX_ICONS ) { - for( int j=data[master_column].total-1; j>=0; --j ) { + switch( display_format ) { + case LISTBOX_ICONS: + case LISTBOX_ICONS_PACKED: + case LISTBOX_ICON_LIST: { + for( int j=data[master_column].total; --j>=0; ) { int icon_x, icon_y, icon_w, icon_h; int text_x, text_y, text_w, text_h; BC_ListBoxItem *item = data[master_column].values[j]; @@ -2055,8 +2093,9 @@ int BC_ListBox::get_cursor_item(ArrayList *data, int cursor_x, return j; } } - } - else if( gui ) { + return -1; } + case LISTBOX_TEXT: + if( !gui ) break; // Text is treed // Cursor is inside items rectangle if( cursor_x >= 0 && @@ -2090,11 +2129,20 @@ int BC_ListBox::get_cursor_item(ArrayList *data, int cursor_x, } } } + break; } return -1; } +// short version +int BC_ListBox::get_cursor_item() +{ + int rx, ry; + gui->get_relative_cursor(rx, ry); + return get_cursor_item(data, rx, ry, 0, 0); +} + int BC_ListBox::repeat_event(int64_t duration) { switch( current_operation ) { @@ -2655,7 +2703,6 @@ int BC_ListBox::button_press_event() int BC_ListBox::button_release_event() { int result = 0; - int cursor_x, cursor_y; int do_event = 0; new_value = 0; unset_scroll_repeat(); @@ -2678,11 +2725,7 @@ int BC_ListBox::button_release_event() //printf("BC_ListBox::button_release_event 10\n"); current_operation = NO_OPERATION; if( gui ) { - translate_coordinates(top_level->event_win, gui->win, - gui->get_cursor_x(), gui->get_cursor_y(), - &cursor_x, &cursor_y); - selection_number1 = selection_number = - get_cursor_item(data, cursor_x, cursor_y); + selection_number1 = selection_number = get_cursor_item(); //printf("BC_ListBox::button_release_event %d %d\n", selection_number2, selection_number1); } @@ -3246,7 +3289,8 @@ int BC_ListBox::drag_stop_event() // Move icon - if( display_format == LISTBOX_ICONS ) { + if( display_format == LISTBOX_ICONS || + display_format == LISTBOX_ICONS_PACKED ) { reposition_item(data, selection_number, top_level->cursor_x - drag_popup->get_w() / 2 - @@ -3505,7 +3549,7 @@ int BC_ListBox::keypress_event() break; default: - if( !ctrl_down() ) { + if( show_query && !ctrl_down() ) { int query_len = strlen(query); if( query_len < (int)sizeof(query)-1 && top_level->get_keypress() > 30 && @@ -3519,12 +3563,10 @@ int BC_ListBox::keypress_event() if( query_len > 0 ) query[--query_len] = 0; new_selection = query_list(); } - if( show_query ) { - if( query_len > 0 ) - show_tooltip(query); - else - hide_tooltip(); - } + if( query_len > 0 ) + show_tooltip(query); + else + hide_tooltip(); redraw = 1; result = 1; } @@ -3577,6 +3619,7 @@ void BC_ListBox::clear_listbox(int x, int y, int w, int h) void BC_ListBox::update_format(int display_format, int redraw) { this->display_format = display_format; + packed_icons = display_format == LISTBOX_ICONS_PACKED ? 1 : 0; xposition = 0; yposition = 0; if( redraw && gui ) draw_items(1, 1); } @@ -3606,7 +3649,8 @@ int BC_ListBox::draw_items(int flush, int draw_bg) first_in_view = -1; last_in_view = 0; // Icon display - if( display_format == LISTBOX_ICONS ) { + if( display_format == LISTBOX_ICONS || + display_format == LISTBOX_ICONS_PACKED ) { clear_listbox(2, 2 + title_h, view_w, view_h); set_font(MEDIUMFONT); @@ -3653,9 +3697,13 @@ int BC_ListBox::draw_items(int flush, int draw_bg) if( item->icon ) gui->pixmap->draw_pixmap(item->icon, icon_x + ICON_MARGIN, icon_y + ICON_MARGIN); - + char item_text[BCTEXTLEN]; + if( display_format == LISTBOX_ICONS_PACKED ) + gui->truncate_text(item_text, item->text, text_w); + else + strcpy(item_text, item->text); gui->draw_text(text_x + ICON_MARGIN, - text_y + ICON_MARGIN + get_baseline(item), item->text); + text_y + ICON_MARGIN + get_baseline(item), item_text); } else item->set_in_view(0); @@ -3736,7 +3784,7 @@ void BC_ListBox::draw_text_recursive(ArrayList *data, int bl = get_baseline(item); if( bl > row_ascent ) row_ascent = bl; int dt = ht - bl; - if( dt > row_descent ) row_ascent = bl; + if( dt > row_descent ) row_descent = dt; } for( int i=0; i