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

Use unicode box drawing character for the assistant

Browse Source
This commit is contained in:
Maxime Coste 2013-02-26 14:28:42 +01:00
parent ffc5a4a334
commit 3d19111570
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/commands.cc
View File

@ -559,14 +559,13 @@ void menu(const CommandParameters& params, Context& context)
static String assist(String message, CharCount maxWidth) static String assist(String message, CharCount maxWidth)
{ {
static const std::vector<String> assistant = static const std::vector<String> assistant =
{ R"( __ )", { R"( ╭──╮ )",
R"( / \ )", R"( │ │ )",
R"( | | )", R"( @ @ ╭)",
R"( @ @ /)", R"( ││ ││ │)",
R"( || || / )", R"( ││ ││ ╯)",
R"( || || _/ )", R"( │╰─╯│ )",
R"( |\_/| )", R"( ╰───╯ )",
R"( \___/ )",
R"( )" }; R"( )" };
const CharCount maxBubbleWidth = maxWidth - assistant[0].char_length() - 6; const CharCount maxBubbleWidth = maxWidth - assistant[0].char_length() - 6;
@ -606,23 +605,21 @@ static String assist(String message, CharCount maxWidth)
} }
String result; String result;
LineCount lineCount{std::max<int>(8, lines.size() + 3)}; LineCount lineCount{std::max<int>(assistant.size()-1, lines.size() + 2)};
for (LineCount i = 0; i < lineCount; ++i) for (LineCount i = 0; i < lineCount; ++i)
{ {
result += assistant[std::min((int)i, (int)assistant.size()-1)]; result += assistant[std::min((int)i, (int)assistant.size()-1)];
if (i == 0) if (i == 0)
result += " " + String('_', (int)bubbleWidth) + " "; result += "╭─" + String(Codepoint{L'─'}, (int)bubbleWidth) + "─╮";
else if (i == 1) else if (i < lines.size() + 1)
result += "/ " + String(' ', (int)bubbleWidth) + " \\";
else if (i < lines.size() + 2)
{ {
auto& line = lines[(int)i - 2]; auto& line = lines[(int)i - 1];
const CharCount padding = std::max(bubbleWidth - line.char_length(), 0_char); const CharCount padding = std::max(bubbleWidth - line.char_length(), 0_char);
result += "| " + line + String(' ', padding) + " |"; result += "│ " + line + String(' ', padding) + " │";
} }
else if (i == lines.size() + 2) else if (i == lines.size() + 1)
result += "\\_" + String('_', (int)bubbleWidth) + "_/"; result += "╰─" + String(Codepoint{L'─'}, (int)bubbleWidth) + "─╯";
result += "\n"; result += "\n";
} }