ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: reshuffle some lines and adjust indentation after previous change 

Also, exclude the state-flag stuff from the tiny version.
master
Benno Schulenberg 2020-09-23 09:21:15 +02:00
parent d679bbc802
commit 7ff6b97e5c
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/winio.c
View File

@ -1976,13 +1976,14 @@ void titlebar(const char *path)
else else
path = openfile->filename; path = openfile->filename;
if (ISSET(STATEFLAGS) && !ISSET(VIEW_MODE)) if (ISSET(VIEW_MODE))
state = "+.xxxxx";
else
if (openfile->modified)
state = _("Modified");
else if (ISSET(VIEW_MODE))
state = _("View"); state = _("View");
#ifndef NANO_TINY
else if (ISSET(STATEFLAGS))
state = "+.xxxxx";
#endif
else if (openfile->modified)
state = _("Modified");
else if (ISSET(RESTRICTED)) else if (ISSET(RESTRICTED))
state = _("Restricted"); state = _("Restricted");
else else
@ -2042,6 +2043,7 @@ void titlebar(const char *path)
free(caption); free(caption);
} }
#ifndef NANO_TINY
/* When requested, show on the title bar the state of three options and /* When requested, show on the title bar the state of three options and
* the state of the mark and whether a macro is being recorded. */ * the state of the mark and whether a macro is being recorded. */
if (ISSET(STATEFLAGS) && !ISSET(VIEW_MODE)) { if (ISSET(STATEFLAGS) && !ISSET(VIEW_MODE)) {
@ -2055,12 +2057,14 @@ void titlebar(const char *path)
waddstr(topwin, recording ? "R" : " "); waddstr(topwin, recording ? "R" : " ");
waddstr(topwin, ISSET(SOFTWRAP) ? "S" : " "); waddstr(topwin, ISSET(SOFTWRAP) ? "S" : " ");
} }
} else { } else
/* Right-align the state if there's room; otherwise, trim it. */ #endif
if (statelen > 0 && statelen <= COLS) {
mvwaddstr(topwin, 0, COLS - statelen, state); /* If there's room, right-align the state word; otherwise, clip it. */
else if (statelen > 0) if (statelen > 0 && statelen <= COLS)
mvwaddnstr(topwin, 0, 0, state, actual_x(state, COLS)); mvwaddstr(topwin, 0, COLS - statelen, state);
else if (statelen > 0)
mvwaddnstr(topwin, 0, 0, state, actual_x(state, COLS));
} }
wattroff(topwin, interface_color_pair[TITLE_BAR]); wattroff(topwin, interface_color_pair[TITLE_BAR]);