p
/
nncmpp
1
1
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Show the current path in Library 

The UI code is totally ad-hoc and ugly.
This commit is contained in:
Přemysl Eric Janouch 2017-06-05 00:56:34 +02:00
parent 2223680504
commit a343156930
Signed by: p
GPG Key ID: B715679E3A361BE6
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
nncmpp.c
View File

@ -31,6 +31,7 @@
XX( TAB_BAR, "tab_bar", -1, -1, A_REVERSE ) \ XX( TAB_BAR, "tab_bar", -1, -1, A_REVERSE ) \
XX( TAB_ACTIVE, "tab_active", -1, -1, A_UNDERLINE ) \ XX( TAB_ACTIVE, "tab_active", -1, -1, A_UNDERLINE ) \
/* Listview */ \ /* Listview */ \
XX( HEADER, "header", -1, -1, A_UNDERLINE ) \
XX( EVEN, "even", -1, -1, 0 ) \ XX( EVEN, "even", -1, -1, 0 ) \
XX( ODD, "odd", -1, -1, 0 ) \ XX( ODD, "odd", -1, -1, 0 ) \
XX( DIRECTORY, "directory", -1, -1, 0 ) \ XX( DIRECTORY, "directory", -1, -1, 0 ) \
@ -544,6 +545,8 @@ struct tab
char *name; ///< Visible identifier char *name; ///< Visible identifier
size_t name_width; ///< Visible width of the name size_t name_width; ///< Visible width of the name
char *header; ///< The header, should there be any
// Implementation: // Implementation:
// TODO: free() callback? // TODO: free() callback?
@ -617,6 +620,7 @@ static struct app_context
int header_height; ///< Height of the header int header_height; ///< Height of the header
int tabs_offset; ///< Offset to tabs or -1
int controls_offset; ///< Offset to player controls or -1 int controls_offset; ///< Offset to player controls or -1
int gauge_offset; ///< Offset to the gauge or -1 int gauge_offset; ///< Offset to the gauge or -1
int gauge_width; ///< Width of the gauge, if present int gauge_width; ///< Width of the gauge, if present
@ -1111,6 +1115,7 @@ app_draw_header (void)
// TODO: call app_fix_view_range() if it changes from the previous value // TODO: call app_fix_view_range() if it changes from the previous value
g.header_height = 0; g.header_height = 0;
g.tabs_offset = -1;
g.controls_offset = -1; g.controls_offset = -1;
g.gauge_offset = -1; g.gauge_offset = -1;
g.gauge_width = 0; g.gauge_width = 0;
@ -1138,9 +1143,18 @@ app_draw_header (void)
row_buffer_append (&buf, APP_TITLE, attrs[g.active_tab == g.help_tab]); row_buffer_append (&buf, APP_TITLE, attrs[g.active_tab == g.help_tab]);
row_buffer_append (&buf, " ", attrs[false]); row_buffer_append (&buf, " ", attrs[false]);
g.tabs_offset = g.header_height;
LIST_FOR_EACH (struct tab, iter, g.tabs) LIST_FOR_EACH (struct tab, iter, g.tabs)
row_buffer_append (&buf, iter->name, attrs[iter == g.active_tab]); row_buffer_append (&buf, iter->name, attrs[iter == g.active_tab]);
app_flush_header (&buf, attrs[false]); app_flush_header (&buf, attrs[false]);
const char *header = g.active_tab->header;
if (header)
{
row_buffer_init (&buf);
row_buffer_append (&buf, header, APP_ATTR (HEADER));
app_flush_header (&buf, APP_ATTR (HEADER));
}
} }
static int static int
@ -1652,12 +1666,12 @@ app_process_action (enum action action)
break; break;
case ACTION_GOTO_PAGE_PREVIOUS: case ACTION_GOTO_PAGE_PREVIOUS:
app_scroll (-app_fitting_items ()); app_scroll (-app_visible_items ());
app_move_selection (-app_fitting_items ()); app_move_selection (-app_visible_items ());
break; break;
case ACTION_GOTO_PAGE_NEXT: case ACTION_GOTO_PAGE_NEXT:
app_scroll (app_fitting_items ()); app_scroll (app_visible_items ());
app_move_selection (app_fitting_items ()); app_move_selection (app_visible_items ());
break; break;
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -1701,7 +1715,7 @@ app_process_left_mouse_click (int line, int column, bool double_click)
free (where); free (where);
} }
} }
else if (line == g.header_height - 1) else if (line == g.tabs_offset)
{ {
struct tab *winner = NULL; struct tab *winner = NULL;
int indent = strlen (APP_TITLE); int indent = strlen (APP_TITLE);
@ -1720,7 +1734,7 @@ app_process_left_mouse_click (int line, int column, bool double_click)
app_switch_tab (winner); app_switch_tab (winner);
} }
else else if (line >= g.header_height)
{ {
struct tab *tab = g.active_tab; struct tab *tab = g.active_tab;
int row_index = line - g.header_height; int row_index = line - g.header_height;
@ -2099,6 +2113,12 @@ library_tab_change_level (const char *new_path)
str_reset (path); str_reset (path);
str_append (path, new_path); str_append (path, new_path);
free (g_library_tab.super.header);
g_library_tab.super.header = NULL;
if (path->len)
g_library_tab.super.header = xstrdup_printf ("/%s", path->str);
} }
static void static void