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

Use LineCount instead of int for ncurses assistant margin

Browse Source
This commit is contained in:
Maxime Coste 2017-05-10 11:35:12 +01:00
parent a0752d8d46
commit 8fa7e67abc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ncurses_ui.cc
View File

@ -878,14 +878,14 @@ String make_info_box(StringView title, StringView message, ColumnCount max_width
auto line_count = max(assistant_size.line-1, auto line_count = max(assistant_size.line-1,
LineCount{(int)lines.size()} + 2); LineCount{(int)lines.size()} + 2);
const int assistant_top_margin = ((int)line_count - (int)assistant_size.line+1) / 2; const auto assistant_top_margin = (line_count - assistant_size.line+1) / 2;
for (LineCount i = 0; i < line_count; ++i) for (LineCount i = 0; i < line_count; ++i)
{ {
constexpr Codepoint dash{L'─'}; constexpr Codepoint dash{L'─'};
if (not assistant.empty()) if (not assistant.empty())
{ {
if (i >= assistant_top_margin) if (i >= assistant_top_margin)
result += assistant[min((int)i - assistant_top_margin, (int)assistant_size.line-1)]; result += assistant[(int)min(i - assistant_top_margin, assistant_size.line-1)];
else else
result += assistant[(int)assistant_size.line-1]; result += assistant[(int)assistant_size.line-1];
} }