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

minibar: drop the side spaces before suppressing the state flags 

Also, consistently keep the right-side elements at least two spaces
away from the modification asterisk.
master
Benno Schulenberg 2020-12-30 19:01:35 +01:00
parent c8c7986f65
commit 45efe28f05
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/winio.c
View File

@ -2092,7 +2092,8 @@ void minibar(void)
placewidth = strlen(location); placewidth = strlen(location);
namewidth = breadth(thename); namewidth = breadth(thename);
if (COLS < 12 || namewidth > COLS - 11) /* If the file name is relatively long, drop the side spaces. */
if (namewidth + 19 > COLS)
padding = 0; padding = 0;
if (COLS > 4) { if (COLS > 4) {
@ -2133,7 +2134,7 @@ void minibar(void)
mvwaddstr(bottomwin, 0, COLS - 27 - placewidth, location); mvwaddstr(bottomwin, 0, COLS - 27 - placewidth, location);
/* Display the hexadecimal code of the character under the cursor. */ /* Display the hexadecimal code of the character under the cursor. */
if (namewidth + tallywidth + 27 < COLS) { if (namewidth + tallywidth + 28 < COLS) {
char *thisline = openfile->current->data; char *thisline = openfile->current->data;
if (thisline[openfile->current_x] == '\0') if (thisline[openfile->current_x] == '\0')
@ -2150,8 +2151,8 @@ void minibar(void)
} }
/* Display the state of three flags, and the state of macro and mark. */ /* Display the state of three flags, and the state of macro and mark. */
if (namewidth + tallywidth + 18 < COLS) { if (namewidth + tallywidth + 14 + 2 * padding < COLS) {
wmove(bottomwin, 0, COLS - 13); wmove(bottomwin, 0, COLS - 11 - padding);
show_states_at(bottomwin); show_states_at(bottomwin);
} }