xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always use the base LineNumber face for the line number separator

Browse Source 
Fixes #1431 as we can now just hide the wrapped line numbers by
setting the LineNumberWrapped foreground and background to the
LineNumber background.
This commit is contained in:
Maxime Coste 2017-06-26 13:45:56 +01:00
parent f788333778
commit 1a64ba18d3
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/highlighters.cc
View File

@ -1022,7 +1022,7 @@ private:
int digit_count = compute_digit_count(context); int digit_count = compute_digit_count(context);
char format[16]; char format[16];
format_to(format, "%{}d{}", digit_count, m_separator); format_to(format, "%{}d", digit_count);
const int main_line = (int)context.selections().main().cursor().line + 1; const int main_line = (int)context.selections().main().cursor().line + 1;
int last_line = -1; int last_line = -1;
for (auto& line : display_buffer.lines()) for (auto& line : display_buffer.lines())
@ -1033,10 +1033,11 @@ private:
current_line - main_line : current_line; current_line - main_line : current_line;
char buffer[16]; char buffer[16];
snprintf(buffer, 16, format, std::abs(line_to_format)); snprintf(buffer, 16, format, std::abs(line_to_format));
DisplayAtom atom{buffer}; const auto atom_face = last_line == current_line ? face_wrapped :
atom.face = last_line == current_line ? face_wrapped :
((m_hl_cursor_line and is_cursor_line) ? face_absolute : face); ((m_hl_cursor_line and is_cursor_line) ? face_absolute : face);
line.insert(line.begin(), std::move(atom)); line.insert(line.begin(), {buffer, atom_face});
line.insert(line.begin() + 1, {m_separator, face});
last_line = current_line; last_line = current_line;
} }
} }