Give lineup names and the squad table more space (by Codex)

This commit is contained in:
Codex committed 2026-10-25 11:54:33 +01:00
1 parent 8661c612b0
commit cdfcb641b4
7 files changed
+81 -54

No files matched your search

+2 -2
View File
@@ -147,8 +147,8 @@ bool App::lineup_event(Rml::Event &event) {
const auto p=point(mx,my);lineup_drag_["ghost"]=p;
if(p.is_array())if(auto *ghost=element("lineup-ghost")) {
ghost->SetProperty("display","block");
ghost->SetProperty("left",scalar((8+p[0].get<int>()/18.0*84)*lineup_art_width_dp/100-63)+"dp");
ghost->SetProperty("top",scalar((10+p[1].get<int>()/8.0*80)*lineup_art_height_dp/100-76.86)+"dp");
ghost->SetProperty("left",scalar((8+p[0].get<int>()/18.0*84)*lineup_art_width_dp/100-lineup_player_anchor_x_dp)+"dp");
ghost->SetProperty("top",scalar((10+p[1].get<int>()/8.0*80)*lineup_art_height_dp/100-lineup_player_anchor_y_dp)+"dp");
dirty_=true;
}
stop();return true;
+20 -10
View File
@@ -1,11 +1,21 @@
// SPDX-License-Identifier: GPL-3.0-only
namespace {
// Shared with lineup_controls.inc: proportional outer pitch and its border-free art box.
constexpr double lineup_pitch_width_dp = 1920.0;
constexpr double lineup_pitch_height_dp = lineup_pitch_width_dp * 117.0 / 196.0;
constexpr double lineup_roster_height_dp = 1216.0;
constexpr double lineup_pitch_top_dp = 1256.0;
constexpr double lineup_pitch_height_dp = 608.0;
constexpr double lineup_pitch_width_dp = lineup_pitch_height_dp * 196.0 / 117.0;
constexpr double lineup_pitch_border_dp = 2.0;
constexpr double lineup_art_width_dp = lineup_pitch_width_dp - 2.0 * lineup_pitch_border_dp;
constexpr double lineup_art_height_dp = lineup_pitch_height_dp - 2.0 * lineup_pitch_border_dp;
constexpr double lineup_player_size_dp = 126.0 * lineup_pitch_width_dp / 1920.0;
constexpr double lineup_player_anchor_x_dp = lineup_player_size_dp * 0.5;
constexpr double lineup_player_anchor_y_dp = lineup_player_size_dp * 0.61;
constexpr double lineup_controls_width_dp = 2612.0 - lineup_pitch_width_dp - 40.0;
constexpr double lineup_formation_width_dp = (lineup_controls_width_dp - 18.0) / 2.0;
constexpr double lineup_tools_width_dp = lineup_controls_width_dp - 16.0;
constexpr double lineup_order_width_dp = (lineup_tools_width_dp - 40.0) / 2.0;
constexpr double lineup_taker_width_dp = (lineup_tools_width_dp - 36.0) / 3.0;
constexpr int lineup_pitch_raster_px = 2048;
// Current demo follows the Classic German/Modern24-slot markers:11 start,6 bench.
// This is not a universal match rule; a future session adapter supplies its DTO status.
@@ -144,11 +154,11 @@ std::string App::render_lineup() {
for (size_t i=0;i<std::min(size_t(11),rows.size());++i) {
const auto &row=rows[i], &point=l.at("points")[i];
const bool selected=lineup_selected_==row.at("id").get<std::string>();
const auto x=(8+point[0].get<int>()/18.0*84)*lineup_art_width_dp/100.0-63;
const auto y=(10+point[1].get<int>()/8.0*80)*lineup_art_height_dp/100.0-76.86;
out+=btn("lineup-player",img(selected?"lineup.player.selected":"lineup.player.normal",126,126)+"<span class=\"lineup-jersey\">"+std::to_string(i+1)+"</span>","lineup-player",player_attrs(row,"lineup-player-")+attr("style",rect(x,y,126,126)));
const auto x=(8+point[0].get<int>()/18.0*84)*lineup_art_width_dp/100.0-lineup_player_anchor_x_dp;
const auto y=(10+point[1].get<int>()/8.0*80)*lineup_art_height_dp/100.0-lineup_player_anchor_y_dp;
out+=btn("lineup-player",img(selected?"lineup.player.selected":"lineup.player.normal",lineup_player_size_dp,lineup_player_size_dp)+"<span class=\"lineup-jersey\">"+std::to_string(i+1)+"</span>","lineup-player",player_attrs(row,"lineup-player-")+attr("style",rect(x,y,lineup_player_size_dp,lineup_player_size_dp)));
}
out+="<div id=\"lineup-ghost\" class=\"lineup-ghost\">"+img("lineup.player.ghost",126,126)+"</div></div><aside class=\"lineup-controls\"><nav class=\"lineup-tabs\" aria-label=\"Aufstellungsansichten\">"+data_btn()+view_btn();
out+="<div id=\"lineup-ghost\" class=\"lineup-ghost\">"+img("lineup.player.ghost",lineup_player_size_dp,lineup_player_size_dp)+"</div></div><aside class=\"lineup-controls\"><nav class=\"lineup-tabs\" aria-label=\"Aufstellungsansichten\">"+data_btn()+view_btn();
for (const auto &[side,label]:std::array<std::pair<const char*,const char*>,3>{{{"formations","Aufst."},{"orders","Anweis."},{"takers","Schütze"}}})
out+=btn("lineup-side",label,"lineup-tab",attr("id","lineup-side-"+std::string(side))+attr("data-id",side)+attr("aria-pressed",lineup_side_==side?"true":"false"));
out+="</nav><div class=\"lineup-side\" id=\"lineup-side\">";
@@ -158,8 +168,8 @@ std::string App::render_lineup() {
const auto point=i<4?demo_lineup_formations()[size_t(i)]:l.at("custom")[size_t(i-4)];
const auto mini=lineup_mini(point,theme_);
const std::string label=i<4?"Aufstellung "+std::to_string(i+1):"Eigene "+std::to_string(i-3);
const auto art=picture(renderer_.diagram("lineup-mini-"+std::to_string(i)+"-"+theme_,mini,520),260,156);
out+="<div class=\"lineup-formation-cell "+std::string(i>=4?"custom":"")+"\" style=\""+rect(0,slot*221.5,652,209.5)+"\">";
const auto art=picture(renderer_.diagram("lineup-mini-"+std::to_string(i)+"-"+theme_,mini,520),200,120);
out+="<div class=\"lineup-formation-cell "+std::string(i>=4?"custom":"")+"\" style=\""+rect((slot%2)*(lineup_formation_width_dp+18.0),(slot/2)*172.0,lineup_formation_width_dp,160)+"\">";
out+=btn("lineup-formation","<span class=\"lineup-mini\">"+art+"</span><span class=\"lineup-formation-label\">"+label+"</span>","lineup-formation",
attr("id","lineup-formation-"+std::to_string(i))+attr("data-id",std::to_string(i))+attr("aria-pressed",l.at("formation")==i?"true":"false")+(point.is_null()?" disabled=\"disabled\"":""));
if (i>=4) out+=btn("lineup-save","Merken","lineup-save",attr("id","lineup-save-"+std::to_string(i-4))+attr("data-id",std::to_string(i-4)));
@@ -183,7 +193,7 @@ std::string App::render_lineup() {
for (int i=0;i<4;++i) {
const auto value=l.at("orders").at(lineup_selected_)[size_t(i)].get<int>();
const auto icon=lineup_svg("<path d=\""+std::string(paths[size_t(i)])+"\" fill=\"none\" stroke=\""+std::string(theme_=="silver"?"#25617a":theme_=="matchday"?"#efb2aa":"#a9dccb")+"\" stroke-width=\"3\"/>","0 0 44 44");
out+="<label class=\"lineup-order-row\" style=\"top:"+std::to_string(135+i*83)+"dp;\"><span class=\"lineup-order-icon\">"+picture(renderer_.diagram("lineup-order-icon-"+std::to_string(i)+"-"+theme_,icon,88),44,44)+"</span><input type=\"range\" min=\"2\" max=\"40\" step=\"1\" value=\""+std::to_string(value)+"\" id=\"lineup-order-"+std::to_string(i)+"\" data-lineup-order=\""+std::to_string(i)+"\" data-player=\""+esc(lineup_selected_)+"\" aria-label=\"Anweisung "+std::to_string(i+1)+"\"/><span class=\"lineup-order-value\" id=\"lineup-order-value-"+std::to_string(i)+"\">"+std::to_string(value)+"</span></label>";
out+="<label class=\"lineup-order-row\" style=\"top:"+scalar(135+(i/2)*132.0)+"dp;left:"+scalar((i%2)*(lineup_order_width_dp+40.0))+"dp;\"><span class=\"lineup-order-icon\">"+picture(renderer_.diagram("lineup-order-icon-"+std::to_string(i)+"-"+theme_,icon,88),44,44)+"</span><input type=\"range\" min=\"2\" max=\"40\" step=\"1\" value=\""+std::to_string(value)+"\" id=\"lineup-order-"+std::to_string(i)+"\" data-lineup-order=\""+std::to_string(i)+"\" data-player=\""+esc(lineup_selected_)+"\" aria-label=\"Anweisung "+std::to_string(i+1)+"\"/><span class=\"lineup-order-value\" id=\"lineup-order-value-"+std::to_string(i)+"\">"+std::to_string(value)+"</span></label>";
}
} else out+="<p class=\"lineup-hint\">Die vier Vorschauwerte gelten für Spieler in der Startelf.</p>";
out+="</section>";
@@ -194,7 +204,7 @@ std::string App::render_lineup() {
return "<span class=\"lineup-option-mark\" aria-hidden=\"true\"><span class=\"lineup-option-check\"></span></span><span class=\"lineup-option-text\">"+esc(name)+"</span>";
};
for (int i=0;i<3;++i) {
out+="<label class=\"lineup-taker-label\"><span>"+std::string(labels[size_t(i)])+"</span><select class=\"lineup-taker\" id=\"lineup-taker-"+std::to_string(i)+"\" data-lineup-taker=\""+std::to_string(i)+"\" aria-label=\""+std::string(labels[size_t(i)])+"schütze\"><option value=\"\" "+std::string(l.at("takers")[size_t(i)]==""?"selected=\"selected\"":"")+">"+option_text("AUTO")+"</option>";
out+="<label class=\"lineup-taker-label\" style=\"left:"+scalar(i*(lineup_taker_width_dp+18.0))+"dp;\"><span>"+std::string(labels[size_t(i)])+"</span><select class=\"lineup-taker\" id=\"lineup-taker-"+std::to_string(i)+"\" data-lineup-taker=\""+std::to_string(i)+"\" aria-label=\""+std::string(labels[size_t(i)])+"schütze\"><option value=\"\" "+std::string(l.at("takers")[size_t(i)]==""?"selected=\"selected\"":"")+">"+option_text("AUTO")+"</option>";
for (size_t r=0;r<std::min(size_t(11),rows.size());++r) {
const auto id=rows[r].at("id").get<std::string>();
out+="<option value=\""+esc(id)+"\" "+std::string(l.at("takers")[size_t(i)]==id?"selected=\"selected\"":"")+">"+option_text(rows[r].at("name").get<std::string>())+"</option>";