mirror of
https://github.com/jarun/nnn.git
synced 2024-11-28 05:41:31 +00:00
While drawing lines, set correct color
This commit is contained in:
parent
1a728603bf
commit
a9ebe7ed88
27
src/nnn.c
27
src/nnn.c
|
@ -4327,26 +4327,38 @@ static int adjust_cols(int ncols)
|
|||
} else
|
||||
ncols -= 3; /* Preceding space, indicator, newline */
|
||||
|
||||
attron(COLOR_PAIR(cfg.curctx + 1) | A_BOLD);
|
||||
cfg.dircolor = 1;
|
||||
|
||||
return ncols;
|
||||
}
|
||||
|
||||
static void draw_line(char *path, int ncols)
|
||||
{
|
||||
bool dir = FALSE;
|
||||
|
||||
ncols = adjust_cols(ncols);
|
||||
|
||||
if (dents[last].flags & DIR_OR_LINK_TO_DIR) {
|
||||
attron(COLOR_PAIR(cfg.curctx + 1) | A_BOLD);
|
||||
dir = TRUE;
|
||||
}
|
||||
move(2 + last - curscroll, 0);
|
||||
printptr(&dents[last], ncols, false);
|
||||
|
||||
if (dents[cur].flags & DIR_OR_LINK_TO_DIR) {
|
||||
if (!dir) {/* First file is not a directory */
|
||||
attron(COLOR_PAIR(cfg.curctx + 1) | A_BOLD);
|
||||
dir = TRUE;
|
||||
}
|
||||
} else if (dir) { /* Second file is not a directory */
|
||||
attroff(COLOR_PAIR(cfg.curctx + 1) | A_BOLD);
|
||||
dir = FALSE;
|
||||
}
|
||||
|
||||
move(2 + cur - curscroll, 0);
|
||||
printptr(&dents[cur], ncols, true);
|
||||
|
||||
/* Must reset e.g. no files in dir */
|
||||
if (cfg.dircolor) {
|
||||
if (dir)
|
||||
attroff(COLOR_PAIR(cfg.curctx + 1) | A_BOLD);
|
||||
cfg.dircolor = 0;
|
||||
}
|
||||
|
||||
statusbar(path);
|
||||
}
|
||||
|
@ -4439,6 +4451,9 @@ static void redraw(char *path)
|
|||
|
||||
ncols = adjust_cols(ncols);
|
||||
|
||||
attron(COLOR_PAIR(cfg.curctx + 1) | A_BOLD);
|
||||
cfg.dircolor = 1;
|
||||
|
||||
/* Print listing */
|
||||
for (i = curscroll; i < ndents && i < curscroll + onscreen; ++i)
|
||||
printptr(&dents[i], ncols, i == cur);
|
||||
|
|
Loading…
Reference in a new issue