mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-28 05:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #989 from luukvbaal/adjust_cols

Browse source 
Fix adjust_cols for icons
This commit is contained in:
Piña Colada 2021-05-09 06:58:26 +05:30 committed by GitHub
parent f3fe27e694 6c450bee94
commit f45967c4a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/nnn.c
View file

@ -5705,6 +5705,9 @@ static void statusbar(char *path)
static int adjust_cols(int n)
{
/* Calculate the number of cols available to print entry name */
#ifdef ICONS_ENABLED
n -= (g_state.oldcolor ? 0 : 1 + xstrlen(ICON_PADDING_LEFT) + xstrlen(ICON_PADDING_RIGHT));
#endif
if (cfg.showdetail) {
/* Fallback to light mode if less than 35 columns */
if (n < 36) {
@ -5717,12 +5720,7 @@ static int adjust_cols(int n)
}
/* 3 = Preceding space, indicator, newline */
#ifdef ICONS_ENABLED
return (n - (g_state.oldcolor ? 3
: 3 + xstrlen(ICON_PADDING_LEFT) + xstrlen(ICON_PADDING_RIGHT) + 1));
#else
return (n - 3);
#endif
}
static void draw_line(char *path, int ncols)