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

Slight refactor of NCursesUI ui_options handling

Browse Source
This commit is contained in:
Maxime Coste 2015-09-11 13:20:37 +01:00
parent f274aba746
commit afbe2f10d5
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ncurses_ui.cc
View File

@ -934,12 +934,10 @@ void NCursesUI::set_ui_options(const Options& options)
{ {
{ {
auto it = options.find("ncurses_assistant"); auto it = options.find("ncurses_assistant");
if (it == options.end()) if (it == options.end() or it->second == "clippy")
m_assistant = assistant_clippy; m_assistant = assistant_clippy;
else if (it->second == "cat") else if (it->second == "cat")
m_assistant = assistant_cat; m_assistant = assistant_cat;
else if (it->second == "clippy")
m_assistant = assistant_clippy;
else if (it->second == "none" or it->second == "off") else if (it->second == "none" or it->second == "off")
m_assistant = ConstArrayView<StringView>{}; m_assistant = ConstArrayView<StringView>{};
} }
@ -958,16 +956,12 @@ void NCursesUI::set_ui_options(const Options& options)
{ {
auto wheel_down_it = options.find("ncurses_wheel_down_button"); auto wheel_down_it = options.find("ncurses_wheel_down_button");
if (wheel_down_it == options.end()) m_wheel_down_button = wheel_down_it != options.end() ?
m_wheel_down_button = 2; str_to_int_ifp(wheel_down_it->second).value_or(2) : 2;
else if (auto down = str_to_int_ifp(wheel_down_it->second))
m_wheel_down_button = *down;
auto wheel_up_it = options.find("ncurses_wheel_up_button"); auto wheel_up_it = options.find("ncurses_wheel_up_button");
if (wheel_up_it == options.end()) m_wheel_up_button = wheel_up_it != options.end() ?
m_wheel_up_button = 4; str_to_int_ifp(wheel_up_it->second).value_or(4) : 4;
else if (auto up = str_to_int_ifp(wheel_up_it->second))
m_wheel_up_button = *up;
} }
} }