mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2025-01-15 13:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1711 from quantonganh/dup-first-char-macOS

Browse source 
Double-width icons can cause duplicated first characters in the filename on macOS
This commit is contained in:
Arun 2023-08-20 17:59:30 +05:30 committed by GitHub
parent 66f636de13 d220c50773
commit 1ba85825c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/nnn.c
View file

@ -131,6 +131,18 @@
#include "icons.h" #include "icons.h"
#endif #endif
#if defined(ICONS_ENABLED) && defined(__APPLE__)
/*
* For some reason, wcswidth returns 2 for certain icons on macOS
* leading to duplicated first characters in filenames when navigating.
* https://github.com/jarun/nnn/issues/1692
* There might be a better way to fix it without requiring a refresh.
*/
#define macos_icons_hack() do { clrtoeol(); refresh(); } while(0)
#else
#define macos_icons_hack()
#endif
#ifdef TOURBIN_QSORT #ifdef TOURBIN_QSORT
#include "qsort.h" #include "qsort.h"
#endif #endif
@ -6520,6 +6532,7 @@ static void draw_line(int ncols)
} }
move(2 + last - curscroll, 0); move(2 + last - curscroll, 0);
macos_icons_hack();
printent(&pdents[last], ncols, FALSE); printent(&pdents[last], ncols, FALSE);
if (g_state.oldcolor && (pdents[cur].flags & DIR_OR_DIRLNK)) { if (g_state.oldcolor && (pdents[cur].flags & DIR_OR_DIRLNK)) {
@ -6533,6 +6546,7 @@ static void draw_line(int ncols)
} }
move(2 + cur - curscroll, 0); move(2 + cur - curscroll, 0);
macos_icons_hack();
printent(&pdents[cur], ncols, TRUE); printent(&pdents[cur], ncols, TRUE);
/* Must reset e.g. no files in dir */ /* Must reset e.g. no files in dir */