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

NCursesUI: Show full menu rather than triming to respect anchor

Browse Source
This commit is contained in:
Maxime Coste 2018-03-13 15:18:06 +11:00
parent a480e566dc
commit 6f2b093eec
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ncurses_ui.cc
View File

@ -717,13 +717,9 @@ void NCursesUI::menu_show(ConstArrayView<DisplayLine> items,
m_menu.style = style; m_menu.style = style;
m_menu.anchor = anchor; m_menu.anchor = anchor;
DisplayCoord maxsize = m_dimensions; const DisplayCoord maxsize = m_dimensions;
if (style != MenuStyle::Prompt) if (style != MenuStyle::Prompt and m_status_on_top)
{
if (m_status_on_top)
anchor.line += 1; anchor.line += 1;
maxsize.column -= anchor.column;
}
if (maxsize.column <= 2) if (maxsize.column <= 2)
return; return;
@ -734,12 +730,12 @@ void NCursesUI::menu_show(ConstArrayView<DisplayLine> items,
const auto longest = accumulate(items | transform(&DisplayLine::length), const auto longest = accumulate(items | transform(&DisplayLine::length),
1_col, [](auto&& lhs, auto&& rhs) { return std::max(lhs, rhs); }); 1_col, [](auto&& lhs, auto&& rhs) { return std::max(lhs, rhs); });
const ColumnCount last_column = maxsize.column - 1;
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)(last_column / (longest+1)), 1) : 1;
ColumnCount maxlen = maxsize.column-1; const ColumnCount maxlen = (m_menu.columns > 1 and item_count > 1) ?
if (m_menu.columns > 1 and item_count > 1) last_column / m_menu.columns - 1 : last_column;
maxlen = maxlen / m_menu.columns - 1;
for (auto& item : items) for (auto& item : items)
{ {
@ -757,8 +753,10 @@ void NCursesUI::menu_show(ConstArrayView<DisplayLine> items,
else if (line + height >= maxsize.line) else if (line + height >= maxsize.line)
line = anchor.line - height; line = anchor.line - height;
const ColumnCount column = std::max(0_col, std::min(anchor.column, maxsize.column - longest - 1));
auto width = is_prompt ? maxsize.column : min(longest+1, maxsize.column); auto width = is_prompt ? maxsize.column : min(longest+1, maxsize.column);
m_menu.create({line, anchor.column}, {height, width}); m_menu.create({line, column}, {height, width});
m_menu.selected_item = item_count; m_menu.selected_item = item_count;
m_menu.top_line = 0; m_menu.top_line = 0;