mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-08 20:41:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

(edit_window_list): simplify the listbox selector.

Browse Source 
We use the new run_listbox_with_data().

Signed-off-by: Mooffie <mooffie@gmail.com>
This commit is contained in:
Mooffie 2017-01-25 15:45:41 +02:00
parent 11c1aff4d3
commit 6273b46bb5
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/editor/editwidget.c
View File

@ -319,13 +319,12 @@ get_hotkey (int n)
static void
edit_window_list (const WDialog * h)
{
const size_t offset = 2; /* skip menu and buttonbar */
const size_t dlg_num = g_list_length (h->widgets) - offset;
const size_t dlg_num = g_list_length (h->widgets) - 2; /* 2 = skip menu and buttonbar */
int lines, cols;
Listbox *listbox;
GList *w;
WEdit *selected;
int i = 0;
int rv;
lines = MIN ((size_t) (LINES * 2 / 3), dlg_num);
cols = COLS * 2 / 3;
@ -346,18 +345,13 @@ edit_window_list (const WDialog * h)
vfs_path_as_str (e->filename_vpath));
listbox_add_item (listbox->list, LISTBOX_APPEND_AT_END, get_hotkey (i++),
str_term_trim (fname, WIDGET (listbox->list)->cols - 2), NULL, FALSE);
str_term_trim (fname, WIDGET (listbox->list)->cols - 2), e, FALSE);
g_free (fname);
}
rv = g_list_position (h->widgets, h->current) - offset;
listbox_select_entry (listbox->list, rv);
rv = run_listbox (listbox);
if (rv >= 0)
{
w = g_list_nth (h->widgets, rv + offset);
widget_select (w->data);
}
selected = run_listbox_with_data (listbox, h->current->data);
if (selected != NULL)
widget_select (WIDGET (selected));
}
/* --------------------------------------------------------------------------------------------- */