Expand the lineup pitch and show three squad statuses (by Codex)

This commit is contained in:
Codex committed 2026-10-25 11:10:05 +01:00
1 parent d533f260a0
commit f41823ef6b
9 files changed
+85 -66

No files matched your search

+2 -10
View File
@@ -361,7 +361,7 @@ class App final : public Rml::EventListener {
uint64_t lineup_drag_revision_ = 0;
std::shared_ptr<const Catalog> lineup_drag_world_;
bool lineup_ignore_click_ = false, lineup_reset_scroll_ = false;
std::optional<float> lineup_roster_scroll_, lineup_bench_scroll_;
std::optional<float> lineup_roster_scroll_;
Json transfer_view_ = Json::object(), transfer_draft_, transfer_search_draft_;
std::string transfer_dialog_, transfer_return_focus_, transfer_notice_, transfer_poach_league_, transfer_poach_club_, transfer_picker_;
uint64_t transfer_revision_ = 0;
@@ -834,12 +834,9 @@ class App final : public Rml::EventListener {
report_picker_.clear();
}
lineup_roster_scroll_.reset();
lineup_bench_scroll_.reset();
if (menu_ == "lineup" && last_rendered_menu_ == "lineup") {
if (auto *roster = element("lineup-roster-scroll"))
lineup_roster_scroll_ = lineup_reset_scroll_ ? 0.f : roster->GetScrollTop();
if (auto *bench = element("lineup-bench-scroll"))
lineup_bench_scroll_ = bench->GetScrollTop();
}
lineup_reset_scroll_ = false;
training_scroll_.reset();
@@ -918,8 +915,7 @@ class App final : public Rml::EventListener {
focus_after_render_.starts_with("alm-match-") ||
focus_after_render_.starts_with("contract-player-") ||
focus_after_render_.starts_with("lineup-name-") ||
focus_after_render_.starts_with("lineup-detail-") ||
focus_after_render_.starts_with("lineup-bench-"))
focus_after_render_.starts_with("lineup-detail-"))
report_option_to_scroll_ = focus_after_render_;
focus_after_render_.clear();
}
@@ -1029,10 +1025,6 @@ class App final : public Rml::EventListener {
if (auto *roster = element("lineup-roster-scroll")) roster->SetScrollTop(*lineup_roster_scroll_);
lineup_roster_scroll_.reset();
}
if (lineup_bench_scroll_) {
if (auto *bench = element("lineup-bench-scroll")) bench->SetScrollTop(*lineup_bench_scroll_);
lineup_bench_scroll_.reset();
}
if (menu_ == "transfer") transfer_restore_scroll();
if (!report_option_to_scroll_.empty()) {
if (auto *node = element(report_option_to_scroll_))