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

NCursesUI: Use accumulate algorithm to gather the longest element in menu

Browse Source
This commit is contained in:
Maxime Coste 2018-03-13 14:14:16 +11:00
parent bfaf52f8c0
commit c82bf31378
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ncurses_ui.cc
View File

@ -731,9 +731,8 @@ void NCursesUI::menu_show(ConstArrayView<DisplayLine> items,
const int item_count = items.size(); const int item_count = items.size();
m_menu.items.clear(); // make sure it is empty m_menu.items.clear(); // make sure it is empty
m_menu.items.reserve(item_count); m_menu.items.reserve(item_count);
ColumnCount longest = 1; const auto longest = accumulate(items | transform(std::mem_fn(&DisplayLine::length)),
for (auto& item : items) 1_col, [](auto&& lhs, auto&& rhs) { return std::max(lhs, rhs); });
longest = max(longest, item.length());
const bool is_prompt = style == MenuStyle::Prompt; const bool is_prompt = style == MenuStyle::Prompt;
m_menu.columns = is_prompt ? max((int)((maxsize.column-1) / (longest+1)), 1) : 1; m_menu.columns = is_prompt ? max((int)((maxsize.column-1) / (longest+1)), 1) : 1;
@ -947,7 +946,7 @@ void NCursesUI::info_show(StringView title, StringView content,
const DisplayCoord size{(int)info_box.size(), const DisplayCoord size{(int)info_box.size(),
accumulate(info_box | transform(std::mem_fn(&String::column_length)), 0_col, accumulate(info_box | transform(std::mem_fn(&String::column_length)), 0_col,
[](ColumnCount lhs, ColumnCount rhs){ return lhs < rhs ? rhs : lhs; })}; [](auto&& lhs, auto&& rhs){ return std::max(lhs, rhs); })};
const Rect rect = {m_status_on_top ? 1_line : 0_line, m_dimensions}; const Rect rect = {m_status_on_top ? 1_line : 0_line, m_dimensions};
DisplayCoord pos; DisplayCoord pos;
if (style == InfoStyle::MenuDoc and m_menu) if (style == InfoStyle::MenuDoc and m_menu)