From 8fa7e67abc9815afa78dfbd13bae1516bff564b1 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Wed, 10 May 2017 11:35:12 +0100 Subject: [PATCH] Use LineCount instead of int for ncurses assistant margin --- src/ncurses_ui.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ncurses_ui.cc b/src/ncurses_ui.cc index f5d4d2cf..94246946 100644 --- a/src/ncurses_ui.cc +++ b/src/ncurses_ui.cc @@ -878,14 +878,14 @@ String make_info_box(StringView title, StringView message, ColumnCount max_width auto line_count = max(assistant_size.line-1, 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) { constexpr Codepoint dash{L'─'}; if (not assistant.empty()) { 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 result += assistant[(int)assistant_size.line-1]; }