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

Remove explicit whitespace padding in menu/info

Browse Source 
Rely on the backend to clear content to eol
This commit is contained in:
Maxime Coste 2020-03-28 20:17:39 +11:00
parent 484cfae9d1
commit 63310370f8
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/terminal_ui.cc
View File

@ -852,7 +852,7 @@ void TerminalUI::draw_menu()
kak_assert(m_menu.size.line == 1); kak_assert(m_menu.size.line == 1);
ColumnCount pos = 0; ColumnCount pos = 0;
m_menu.draw({0, 0}, DisplayAtom(m_menu.first_item > 0 ? "< " : " "), m_menu.bg); m_menu.draw({0, 0}, DisplayAtom(m_menu.first_item > 0 ? "< " : ""), m_menu.bg);
int i = m_menu.first_item; int i = m_menu.first_item;
for (; i < item_count and pos < win_width; ++i) for (; i < item_count and pos < win_width; ++i)
@ -861,14 +861,13 @@ void TerminalUI::draw_menu()
const ColumnCount item_width = item.length(); const ColumnCount item_width = item.length();
auto& face = i == m_menu.selected_item ? m_menu.fg : m_menu.bg; auto& face = i == m_menu.selected_item ? m_menu.fg : m_menu.bg;
m_menu.draw({0, pos+2}, item.atoms(), face); m_menu.draw({0, pos+2}, item.atoms(), face);
if (pos + item_width < win_width) if (pos + item_width >= win_width)
m_menu.draw({0, pos + item_width + 2}, DisplayAtom(" "), m_menu.bg);
else
m_menu.draw({0, win_width+2}, DisplayAtom("…"), m_menu.bg); m_menu.draw({0, win_width+2}, DisplayAtom("…"), m_menu.bg);
pos += item_width + 1; pos += item_width + 1;
} }
m_menu.draw({0, win_width+3}, DisplayAtom(i == item_count ? " " : ">"), m_menu.bg); if (i != item_count)
m_menu.draw({0, win_width+3}, DisplayAtom(">"), m_menu.bg);
m_dirty = true; m_dirty = true;
return; return;
@ -1196,6 +1195,9 @@ void TerminalUI::info_show(const DisplayLine& title, const DisplayLineList& cont
{ {
auto draw_atoms = [&, this, pos=DisplayCoord{line}](auto&&... args) mutable { auto draw_atoms = [&, this, pos=DisplayCoord{line}](auto&&... args) mutable {
auto draw = overload( auto draw = overload(
[&](ColumnCount padding) {
pos.column += padding;
},
[&](String str) { [&](String str) {
auto len = str.column_length(); auto len = str.column_length();
m_info.draw(pos, DisplayAtom{std::move(str)}, face); m_info.draw(pos, DisplayAtom{std::move(str)}, face);
@ -1240,10 +1242,10 @@ void TerminalUI::info_show(const DisplayLine& title, const DisplayLineList& cont
auto info_line = lines[(int)line - 1]; auto info_line = lines[(int)line - 1];
const bool trimmed = info_line.trim(0, content_size.column); const bool trimmed = info_line.trim(0, content_size.column);
const ColumnCount padding = content_size.column - info_line.length(); const ColumnCount padding = content_size.column - info_line.length();
draw_atoms("│ ", info_line, String{' ', padding} + (trimmed ? "…│" : " │")); draw_atoms("│ ", info_line, padding, (trimmed ? "…│" : " │"));
} }
else if (line == std::min<LineCount>((int)lines.size() + 1, size.line - 1)) else if (line == std::min<LineCount>((int)lines.size() + 1, size.line - 1))
draw_atoms("╰─" + String(line > lines.size() ? dash : dotted_dash, content_size.column) + "─╯"); draw_atoms("╰─", String(line > lines.size() ? dash : dotted_dash, content_size.column), "─╯");
} }
m_dirty = true; m_dirty = true;
} }