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

Restore info box after a resize as well

Browse Source 
Fixes #425
This commit is contained in:
Maxime Coste 2015-10-13 13:58:24 +01:00
parent 9f78f9bfd5
commit 49557f5b17
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/ncurses_ui.cc
View File

@ -423,9 +423,11 @@ void NCursesUI::check_resize(bool force)
winsize ws; winsize ws;
if (ioctl(fd, TIOCGWINSZ, (void*)&ws) == 0) if (ioctl(fd, TIOCGWINSZ, (void*)&ws) == 0)
{ {
const bool info = (bool)m_info;
const bool menu = (bool)m_menu;
if (m_window) delwin(m_window); if (m_window) delwin(m_window);
if (m_info) m_info.destroy(); if (info) m_info.destroy();
if (m_menu) m_menu.destroy(); if (menu) m_menu.destroy();
resize_term(ws.ws_row, ws.ws_col); resize_term(ws.ws_row, ws.ws_col);
@ -438,11 +440,13 @@ void NCursesUI::check_resize(bool force)
if (char* csr = tigetstr((char*)"csr")) if (char* csr = tigetstr((char*)"csr"))
putp(tparm(csr, (long)0, (long)ws.ws_row)); putp(tparm(csr, (long)0, (long)ws.ws_row));
if (not m_items.empty()) if (menu)
{ {
auto items = std::move(m_items); auto items = std::move(m_items);
menu_show(items, m_menu_anchor, m_menu_fg, m_menu_bg, m_menu_style); menu_show(items, m_menu_anchor, m_menu_fg, m_menu_bg, m_menu_style);
} }
if (info)
info_show(m_info_title, m_info_content, m_info_anchor, m_info_face, m_info_style);
} }
else else
kak_assert(false); kak_assert(false);
@ -824,11 +828,17 @@ void NCursesUI::info_show(StringView title, StringView content,
{ {
info_hide(); info_hide();
m_info_title = title.str();
m_info_content = content.str();
m_info_anchor = anchor;
m_info_face = face;
m_info_style = style;
String info_box; String info_box;
if (style == InfoStyle::Prompt) if (style == InfoStyle::Prompt)
{ {
info_box = make_info_box(title, content, m_dimensions.column, info_box = make_info_box(m_info_title, m_info_content,
m_assistant); m_dimensions.column, m_assistant);
anchor = CharCoord{m_status_on_top ? 0 : m_dimensions.line, anchor = CharCoord{m_status_on_top ? 0 : m_dimensions.line,
m_dimensions.column-1}; m_dimensions.column-1};
} }
@ -844,7 +854,7 @@ void NCursesUI::info_show(StringView title, StringView content,
if (max_width < 4) if (max_width < 4)
return; return;
for (auto& line : wrap_lines(content, max_width)) for (auto& line : wrap_lines(m_info_content, max_width))
info_box += line + "\n"; info_box += line + "\n";
} }

5
src/ncurses_ui.hh
View File

@ -99,6 +99,11 @@ private:
void draw_menu(); void draw_menu();
Window m_info; Window m_info;
String m_info_title;
String m_info_content;
Face m_info_face;
CharCoord m_info_anchor;
InfoStyle m_info_style;
FDWatcher m_stdin_watcher; FDWatcher m_stdin_watcher;
InputCallback m_input_callback; InputCallback m_input_callback;