diff --git a/src/modern/ui/lineup_controls.inc b/src/modern/ui/lineup_controls.inc index ef7a4e2..eb37f8e 100644 --- a/src/modern/ui/lineup_controls.inc +++ b/src/modern/ui/lineup_controls.inc @@ -12,7 +12,7 @@ bool App::lineup_action(const std::string &action,Rml::Element *target) { const auto s=snap(); if (!s.world || !valid_demo_lineup(s.state,*s.world,lineup_managed(s))) return true; const auto &l=s.state.at("lineup"); - const auto small=[&](int max)->int {return id.size()==1 && id[0]>='0' && id[0]<='0'+max ? id[0]-'0':-1;}; + const auto parse_index=[&](int maximum)->int {return id.size()==1 && id[0]>='0' && id[0]<='0'+maximum ? id[0]-'0':-1;}; const auto commit=[&](const Json &payload,const std::string &focus) { const auto result=source_->apply({s.revision,"lineup",payload}); if (!result.ok) {message("Die Aufstellung konnte nicht übernommen werden. Bitte die Ansicht erneut öffnen.");return false;} @@ -39,10 +39,10 @@ bool App::lineup_action(const std::string &action,Rml::Element *target) { if (id=="formations" || id=="orders" || id=="takers") {lineup_side_=id;focus_after_render_="lineup-side-"+id;refresh();} return true; } - if (action=="lineup-page") {const int n=small(1);if(n>=0) {lineup_page_=n;focus_after_render_=n?"lineup-page-prev":"lineup-page-next";refresh();}return true;} - if (action=="lineup-formation") {const int n=small(7);if(n>=0) {lineup_selected_.clear();commit({{"kind","formation"},{"value",n}},"lineup-formation-"+id);}return true;} - if (action=="lineup-save") {const int n=small(3);if(n>=0)commit({{"kind","custom-save"},{"index",n}},"lineup-save-"+id);return true;} - if (action=="lineup-weight") {const int n=small(2);if(n>=0)commit({{"kind","weight"},{"index",n}},"lineup-weight-"+id);return true;} + if (action=="lineup-page") {const int n=parse_index(1);if(n>=0) {lineup_page_=n;focus_after_render_=n?"lineup-page-prev":"lineup-page-next";refresh();}return true;} + if (action=="lineup-formation") {const int n=parse_index(7);if(n>=0) {lineup_selected_.clear();commit({{"kind","formation"},{"value",n}},"lineup-formation-"+id);}return true;} + if (action=="lineup-save") {const int n=parse_index(3);if(n>=0)commit({{"kind","custom-save"},{"index",n}},"lineup-save-"+id);return true;} + if (action=="lineup-weight") {const int n=parse_index(2);if(n>=0)commit({{"kind","weight"},{"index",n}},"lineup-weight-"+id);return true;} if (action=="lineup-auto") {commit({{"kind","takers-auto"}},"lineup-auto");return true;} return true; }