1
1

Merge branch '406_show_filter'

* 406_show_filter:
  Fixed filter by partial file name. Now filter applied to full filename.
  Ticket #406 (show filter in panel header)
Этот коммит содержится в:
Ilia Maslakov 2009-06-22 14:12:19 +00:00
родитель 522f310871 07f0f92d24
Коммит f5980a332d
2 изменённых файлов: 11 добавлений и 2 удалений

Просмотреть файл

@ -1208,7 +1208,7 @@ paint_frame (WPanel *panel)
int header_len;
int side, width;
const char *txt;
char *txt = NULL;
if (!panel->split)
adjust_top_file (panel);
@ -1231,7 +1231,11 @@ paint_frame (WPanel *panel)
for (format = panel->format; format; format = format->next){
if (format->string_fn){
txt = format->title;
if (panel->filter && !strcmp (format->id, "name")) {
txt = g_strdup_printf ("%s [%s]", format->title, panel->filter);
} else {
txt = g_strdup (format->title);
}
header_len = strlen (txt);
if (header_len > format->field_len)
@ -1239,6 +1243,7 @@ paint_frame (WPanel *panel)
attrset (MARKED_COLOR);
addstr (str_fit_to_term (txt, format->field_len, J_CENTER_LEFT));
g_free(txt);
width -= format->field_len;
} else {
attrset (NORMAL_COLOR);

Просмотреть файл

@ -375,6 +375,10 @@ mc_search (const gchar * pattern, const gchar * str, mc_search_type_t type)
return FALSE;
search->search_type = type;
search->is_case_sentitive = TRUE;
if (type == MC_SEARCH_T_GLOB)
search->is_entire_line = TRUE;
ret = mc_search_run (search, str, 0, strlen (str), NULL);
mc_search_free (search);
return ret;