Port achievements and player rankings to the Modern UI (by Codex)

This commit is contained in:
Codex committed 2026-10-25 13:51:36 +01:00
1 parent d419943e86
commit 96e88c9579
29 files changed
+1362 -17

No files matched your search

+23 -3
View File
@@ -14,6 +14,8 @@
#include "modern/ui/demo_sports.hpp"
#include "modern/ui/demo_lineup.hpp"
#include "modern/ui/demo_transfer.hpp"
#include "modern/ui/demo_career_reports.hpp"
#include "modern/ui/demo_rankings.hpp"
#include "modern/ui/desktop.hpp"
#include "modern/ui/gui_assets.hpp"
#include "modern/ui/model.hpp"
@@ -99,7 +101,7 @@ const std::array<std::string, 32> titles = {"Tabellen",
"Stadion",
"Statistiken",
"Umfeld",
"Fairplay",
"Fairplaywertung",
"Highscore",
"Verträge",
"Bilanz",
@@ -366,6 +368,7 @@ class App final : public Rml::EventListener {
std::string transfer_dialog_, transfer_return_focus_, transfer_notice_, transfer_poach_league_, transfer_poach_club_, transfer_picker_;
uint64_t transfer_revision_ = 0;
std::shared_ptr<const Catalog> transfer_world_;
Json career_view_ = Json::object(), rankings_view_ = Json::object();
float device_ratio_ = 1.f;
Json desktop_ = Json::object(), saved_desktop_ = Json::object(),
options_ = Json::object();
@@ -584,6 +587,7 @@ class App final : public Rml::EventListener {
transfer_view_ = Json::object(); transfer_draft_ = transfer_search_draft_ = Json();
transfer_dialog_.clear(); transfer_picker_.clear(); transfer_notice_.clear(); transfer_return_focus_.clear();
transfer_poach_league_.clear(); transfer_poach_club_.clear(); transfer_world_.reset(); transfer_revision_ = 0;
career_view_ = Json::object(); rankings_view_ = Json::object();
advertising_selected_ = -1; advertising_offer_ = 0; advertising_revision_ = 0; advertising_world_.reset();
toto_column_ = 0; toto_dialog_.clear();
for (auto &focus : toto_focus_) focus = {0, 1};
@@ -744,6 +748,16 @@ class App final : public Rml::EventListener {
void close_transfer(bool restore = true);
void transfer_remember_scroll();
void transfer_restore_scroll();
std::string render_achievements();
std::string render_highscore();
bool career_report_action(const std::string &, Rml::Element *);
bool career_report_event(Rml::Event &);
std::string render_scorers();
std::string render_fairplay();
bool rankings_action(const std::string &, Rml::Element *);
bool rankings_event(Rml::Event &);
void rankings_remember_scroll();
void rankings_restore_scroll();
std::string render_almanac();
bool almanac_action(const std::string &, Rml::Element *);
std::string render_indoor();
@@ -818,6 +832,7 @@ class App final : public Rml::EventListener {
// open. Never keep that menu's modal/input gate in the destination view.
if (menu_ != last_rendered_menu_) {
planning_dialog_.clear();
career_view_["dialog"] = ""; career_view_["return_focus"] = "";
lineup_drag_ = Json(); lineup_drag_world_.reset(); lineup_ignore_click_ = false;
transfer_dialog_.clear(); transfer_draft_ = transfer_search_draft_ = Json(); transfer_picker_.clear();
transfer_world_.reset(); transfer_revision_ = 0; transfer_return_focus_.clear();
@@ -871,10 +886,10 @@ class App final : public Rml::EventListener {
setting_menu_markup_ = true;
element("canvas")->SetInnerRML(markup);
setting_menu_markup_ = false;
if (!report_detail_kind_.empty() || !planning_dialog_.empty() || !contracts_dialog_.empty() || !toto_dialog_.empty() || !transfer_dialog_.empty()) {
if (!report_detail_kind_.empty() || !planning_dialog_.empty() || !contracts_dialog_.empty() || !toto_dialog_.empty() || !transfer_dialog_.empty() || !career_view_.value("dialog", "").empty()) {
Rml::ElementList behind;
doc_->QuerySelectorAll(behind,
"#report-underlay button,#report-underlay input,#report-underlay select,#contracts-underlay button,#toto-underlay button,#lineup-underlay button,#lineup-underlay select,#lineup-underlay input,#transfer-underlay button,#transfer-underlay select,#transfer-underlay input,.window .titlebar button");
"#report-underlay button,#report-underlay input,#report-underlay select,#contracts-underlay button,#toto-underlay button,#lineup-underlay button,#lineup-underlay select,#lineup-underlay input,#transfer-underlay button,#transfer-underlay select,#transfer-underlay input,#career-report-underlay button,#career-report-underlay input,#career-report-underlay select,.rankings-scorers button,.rankings-scorers select,.rankings-fairplay button,.window .titlebar button");
for (auto *node : behind)
node->SetProperty("pointer-events", "none");
}
@@ -1026,6 +1041,7 @@ class App final : public Rml::EventListener {
lineup_roster_scroll_.reset();
}
if (menu_ == "transfer") transfer_restore_scroll();
if (menu_ == "scorers" || menu_ == "fairplay") rankings_restore_scroll();
if (!report_option_to_scroll_.empty()) {
if (auto *node = element(report_option_to_scroll_))
node->ScrollIntoView(Rml::ScrollIntoViewOptions(Rml::ScrollAlignment::Nearest));
@@ -1296,6 +1312,10 @@ public:
#include "modern/ui/lineup_controls.inc"
#include "modern/ui/transfer_screens.inc"
#include "modern/ui/transfer_controls.inc"
#include "modern/ui/career_report_screens.inc"
#include "modern/ui/career_report_controls.inc"
#include "modern/ui/rankings_screens.inc"
#include "modern/ui/rankings_controls.inc"
} // namespace
bool is_modern_world(const fs::path &file) {
try {