Port career setup, manager hub and context-aware native UI (by Codex)

This commit is contained in:
Codex authored and Codex committed 2026-10-27 01:57:58 +01:00
1 parent d88bf2872a
commit d085697bb9
37 files changed
+1447 -421

No files matched your search

+24 -6
View File
@@ -15,6 +15,7 @@
#include "modern/ui/demo_opening.hpp"
#include "modern/ui/demo_sports.hpp"
#include "modern/ui/demo_lineup.hpp"
#include "modern/ui/demo_career.hpp"
#include "modern/ui/demo_transfer.hpp"
#include "modern/ui/demo_career_reports.hpp"
#include "modern/ui/demo_rankings.hpp"
@@ -458,7 +459,7 @@ class App final : public Rml::EventListener {
}
Snapshot snap() const { return source_->snapshot(); }
const Json &manager(const Snapshot &s) const {
return s.state.at("managers").at(0);
return demo_career_manager(s.state);
}
const Json *club(const Snapshot &s) const {
return s.world->find("clubs", manager(s).value("club", ""));
@@ -761,7 +762,7 @@ class App final : public Rml::EventListener {
bool entry_name_valid() const;
bool entry_used_club(const std::string &) const;
bool entry_used_portrait(int) const;
bool entry_full() const { return adding_manager_ && managers_draft_.size() >= 4; }
bool entry_full() const { return adding_manager_ && managers_draft_.size() >= size_t(career_national_entry()?1:4); }
void entry_begin();
void entry_add();
void entry_cancel();
@@ -773,6 +774,14 @@ class App final : public Rml::EventListener {
bool entry_input(Rml::Element *);
bool entry_event(Rml::Event &);
Json entry_snapshot() const;
bool career_resign_open_=false,career_game_end_=false;
int career_resign_portrait_=0;
uint64_t career_resign_revision_=0;
const DataSource *career_resign_source_=nullptr;
bool career_national_entry() const {return adding_manager_?source_&&!snap().state.at("edits").at("setup").value("league",true):!start_options_.value("league",true);}
std::string render_career();
bool career_action(const std::string &,Rml::Element *);
bool career_event(Rml::Event &);
std::string render_newgame();
std::string render_manager();
std::string render_opening();
@@ -856,6 +865,7 @@ class App final : public Rml::EventListener {
}
void render() {
if (select_menu_) select_menu_->before_render();
if (source_ && scene_=="desktop" && snap().state.value("career",Json::object()).value("ended",false)){scene_="main";menu_.clear();}
if (scene_ == "desktop" && !files_capturing_ && opening_pending()) {
scene_ = "opening";
menu_.clear();
@@ -919,11 +929,13 @@ class App final : public Rml::EventListener {
else if (scene_ == "mods")
markup = mods_page();
else if (scene_ == "newgame")
markup = render_newgame();
markup = main_menu()+"<div class=\"fill\" style=\"z-index:100;\">"+render_newgame()+"</div>";
else if (scene_ == "manager")
markup = render_manager();
markup = (adding_manager_?render_desktop():main_menu())+"<div class=\"fill\" style=\"z-index:100;\">"+render_manager()+"</div>";
else if (scene_ == "managerhub")
markup = render_desktop()+"<div class=\"fill\" style=\"z-index:100;\">"+render_career()+"</div>";
else if (scene_ == "opening")
markup = render_opening();
markup = main_menu()+"<div class=\"fill\" style=\"z-index:100;\">"+render_opening()+"</div>";
else if (source_)
markup = render_desktop();
if (!menu_.empty())
@@ -937,6 +949,10 @@ class App final : public Rml::EventListener {
doc_->QuerySelectorAll(behind, "#entry-manager-underlay button,#entry-manager-underlay input,#entry-manager-underlay select,.window>.titlebar button");
for (auto *node : behind) node->SetProperty("pointer-events", "none");
}
if(scene_=="managerhub" || (scene_=="manager"&&adding_manager_)){
Rml::ElementList background;doc_->QuerySelectorAll(background,".desktop-layer button,.desktop-layer [data-action]");
for(auto *node:background){node->SetProperty("pointer-events","none");node->SetAttribute("tabindex",-1);}
}
news_after_render();
if (!report_detail_kind_.empty() || !planning_dialog_.empty() || !contracts_dialog_.empty() || !toto_dialog_.empty() || !transfer_dialog_.empty() || !career_view_.value("dialog", "").empty() || !stadium_view_.value("dialog", "").empty()) {
Rml::ElementList behind;
@@ -1303,7 +1319,7 @@ public:
active_mod_.clear();
load_world(config_.world);
scene_ = config_.scene;
if (scene_ != "main" && scene_ != "mods" && scene_ != "newgame" && scene_ != "manager" &&
if (scene_ != "main" && scene_ != "mods" && scene_ != "newgame" && scene_ != "manager" && scene_ != "managerhub" &&
scene_ != "opening" && scene_ != "desktop") {
menu_ = scene_;
scene_ = "desktop";
@@ -1386,6 +1402,8 @@ public:
}
};
#include "modern/ui/entry_controls.inc"
#include "modern/ui/career_screens.inc"
#include "modern/ui/career_controls.inc"
#include "modern/ui/entry_screens.inc"
#include "modern/ui/entry_opening_controls.inc"
#include "modern/ui/entry_opening_screens.inc"