diff --git a/docs/new_ui/desktop/live/README.md b/docs/new_ui/desktop/live/README.md index 72de66c..bd25a79 100644 --- a/docs/new_ui/desktop/live/README.md +++ b/docs/new_ui/desktop/live/README.md @@ -199,3 +199,26 @@ Fehlende oder `null`-Werte bleiben unbekannt; 0 Zuschauer und 0 °C bleiben sichtbar. Alte Aufnahmen ohne diese Felder sind weiterhin gültig. Die mitgelieferte UI-Demo enthält explizite Beispieldaten, ohne RNG, Uhr, Revision oder Karriere zu verändern. Ein autoritativer Anbieter liefert die tatsächlichen Bedingungen. + + +## Unabhängige lokale Navigation + +Managerpfeile und die fünf Detailreiter ersetzen nur den Inhalt rechts. Die +Meldungsliste, Paarungen, Uhr und der Geschwindigkeitsregler bleiben dabei als +RmlUI-Elemente bestehen. Ein Ereignisfilter ersetzt nur die Meldungen links; +Managerauswahl und rechter Scrollbereich bleiben erhalten. Ein erneuter Klick +auf den bereits gewählten Reiter oder Filter löst keinen Inhaltsaufbau aus. +Pause und Geschwindigkeitswahl aktualisieren ihre Beschriftungen direkt. + +Die Änderungen werden nach der Ereignisverarbeitung angewendet, damit keine +noch verwendeten Ziele während ihres Click-Callbacks entfernt werden. Neue +Aufzeichnungsbilder, Bereichswechsel und Dialoge verwenden weiterhin den +vollständigen Renderpfad. Fehlende Teilbereiche fallen auf diesen Pfad zurück. +Die Navigation verändert weder Aufzeichnung noch Quelle oder Revisionsschutz. + +Das Eingabeskript-Snapshot nennt unter `live_view.ui_updates` die tatsächlichen +Dokument-, Detail- und Tickeraktualisierungen. Diese Zähler prüfen, dass bei +lokaler Navigation kein vollständiger Dokumentaufbau stattfindet; sie sind +keine FPS-, Latenz- oder Hardwaremessung. Private Vorher-/Nachher-Bilder, +Fokus-/Scrolltests und ladbare Demostände liegen unter +`bmh_4k_ui/docs/qa/live-retained-2026-10-27/`. diff --git a/src/modern/ui/live_controls.inc b/src/modern/ui/live_controls.inc index cb96b7c..d0860c4 100644 --- a/src/modern/ui/live_controls.inc +++ b/src/modern/ui/live_controls.inc @@ -88,16 +88,20 @@ bool App::live_action(const std::string &action, Rml::Element *target) { if (!action.starts_with("live-")) return false; if (scene_ != "live" || !live_.available()) return true; const auto id = target ? target->GetAttribute("data-id", "") : ""; + bool detail_only = false, ticker_only = false; if (!live_dialog_.empty() && action != "live-dialog-cancel" && action != "live-dialog-apply" && action != "live-tactic-cycle") return true; if (action == "live-back") { live_close(); return true; } if (action == "live-owner-prev" || action == "live-owner-next") { - live_.cycle_owner(action == "live-owner-prev" ? -1 : 1); live_reset_detail_ = true; + if (!live_.cycle_owner(action == "live-owner-prev" ? -1 : 1)) return true; + live_reset_detail_ = detail_only = true; } else if (action == "live-tab") { if (id != "team" && id != "tactics" && id != "opponent" && id != "table" && id != "stats") return true; - live_tab_ = id; live_reset_detail_ = true; + if (live_tab_ == id) return true; + live_tab_ = id; live_reset_detail_ = detail_only = true; } else if (action == "live-filter") { if (id != "all" && id != "highlights" && id != "goal" && id != "yellow") return true; - live_filter_ = id; live_reset_ticker_ = true; + if (live_filter_ == id) return true; + live_filter_ = id; live_reset_ticker_ = ticker_only = true; } else if (action == "live-coverage") { if (id != "all" && id != "single" && id != "conference") return true; live_coverage_ = id; live_reset_ticker_ = true; @@ -114,7 +118,7 @@ bool App::live_action(const std::string &action, Rml::Element *target) { } else if (action == "live-next") { live_.next(); live_last_tick_ = SDL_GetTicks64(); } else if (action == "live-pause") { - live_set_speed(live_.speed() ? 0 : 1); + live_set_speed(live_.speed() ? 0 : 1); return true; } else if (action == "live-review" && live_.finished()) { postmatch_open();return true; } else if (action == "live-review-back") { @@ -140,6 +144,12 @@ bool App::live_action(const std::string &action, Rml::Element *target) { } catch (const std::exception &) { return true; } } else return true; if (target && focus_after_render_.empty()) focus_after_render_ = target->GetId(); + if (detail_only || ticker_only) { + live_detail_pending_ = live_detail_pending_ || detail_only; + live_ticker_pending_ = live_ticker_pending_ || ticker_only; + dirty_ = true; + return true; + } refresh(); return true; } bool App::live_event(Rml::Event &event) { @@ -151,7 +161,7 @@ bool App::live_event(Rml::Event &event) { if (type == "mousedown" && speed_control) live_speed_dragging_ = true; if (type == "mouseup" && live_speed_dragging_) { live_speed_dragging_ = false; live_last_tick_ = SDL_GetTicks64(); - focus_after_render_ = "live-speed"; needs_render_ = true; + focus_after_render_ = "live-speed"; dirty_ = true; } if ((type == "change" || type == "input") && speed_control) { if (setting_menu_markup_) return true; @@ -209,6 +219,9 @@ Json App::live_snapshot() const { status["drafts"] = live_drafts_; status["dialog_draft"] = live_dialog_draft_; status["ticker_scroll"] = element("live-ticker") ? element("live-ticker")->GetScrollTop() : live_ticker_scroll_; status["frame"] = live_.frame(); + // Diagnostic counts describe actual DOM updates, not hardware timing claims. + status["ui_updates"] = {{"document", document_generation_}, + {"detail", live_detail_updates_}, {"ticker", live_ticker_updates_}}; if (live_.available()) { status["owners"] = live_.fixture().at("owners"); status["matches"] = live_.fixture().at("matches"); } return status; } diff --git a/src/modern/ui/live_screens.inc b/src/modern/ui/live_screens.inc index 6b751c6..8a8bc2b 100644 --- a/src/modern/ui/live_screens.inc +++ b/src/modern/ui/live_screens.inc @@ -136,6 +136,24 @@ std::string App::live_dialog_markup(const Json &owner) { btn("live-dialog-apply", "Demovorschau anzeigen", "", "id=\"live-dialog-apply\" " + std::string(live_dialog_ == "lineup" && (live_out_.empty() || live_in_.empty()) ? "disabled" : "")) + ""; return "
" + body + "
"; } +std::string App::live_ticker_events(const Json &frame, size_t &shown) { + const auto &fixture = live_.fixture(); + shown = 0; + std::string out; + for (auto i = frame.at("events").rbegin(); i != frame.at("events").rend(); ++i) { + const auto &event = *i; const auto kind = event.value("kind", ""); + if (live_coverage_ == "single" && event.at("match_id") != live_selected_match_) continue; + if (live_filter_ == "goal" && kind != "goal") continue; + if (live_filter_ == "yellow" && kind != "yellow" && kind != "red") continue; + if (live_filter_ == "highlights" && kind != "goal" && kind != "chance" && kind != "red") continue; + const auto &match = live_match_by_id(fixture.at("matches"), event.at("match_id")); + out += "
()) + "\">" + live_text(std::to_string(event.at("minute").get()) + "′", "live-event-time") + live_badge(match.at(event.at("side").get()), 54) + + "
" + live_text(match.at("home").at("name").get() + " · " + match.at("away").at("name").get(), "live-event-owners") + "

" + live_text(event.at("headline")) + "

" + live_text(event.at("body")) + "

" + live_text(live_score_text(event.at("score")), "live-event-score") + "
"; + ++shown; + } + if (!shown) out += "

" + live_text("Für diesen Filter liegt noch keine Demomeldung vor.") + "

"; + return out; +} std::string App::render_live() { if(live_review_) return render_postmatch(); if (!live_.available()) return ""; @@ -168,19 +186,8 @@ std::string App::render_live() { for (const auto &[id, label] : std::array, 4>{{{"all", "Alles"}, {"highlights", "Highlights"}, {"goal", "Tore"}, {"yellow", "Karten"}}}) out += btn("live-filter", label, live_filter_ == id ? "selected" : "", "id=\"live-filter-" + std::string(id) + "\" data-id=\"" + id + "\""); out += "
"; size_t shown = 0; - for (auto i = frame.at("events").rbegin(); i != frame.at("events").rend(); ++i) { - const auto &event = *i; const auto kind = event.value("kind", ""); - if (live_coverage_ == "single" && event.at("match_id") != live_selected_match_) continue; - if (live_filter_ == "goal" && kind != "goal") continue; - if (live_filter_ == "yellow" && kind != "yellow" && kind != "red") continue; - if (live_filter_ == "highlights" && kind != "goal" && kind != "chance" && kind != "red") continue; - const auto &match = live_match_by_id(fixture.at("matches"), event.at("match_id")); - out += "
()) + "\">" + live_text(std::to_string(event.at("minute").get()) + "′", "live-event-time") + live_badge(match.at(event.at("side").get()), 54) + - "
" + live_text(match.at("home").at("name").get() + " · " + match.at("away").at("name").get(), "live-event-owners") + "

" + live_text(event.at("headline")) + "

" + live_text(event.at("body")) + "

" + live_text(live_score_text(event.at("score")), "live-event-score") + "
"; - ++shown; - } - if (!shown) out += "

" + live_text("Für diesen Filter liegt noch keine Demomeldung vor.") + "

"; - out += "
" + live_text(std::to_string(shown) + " Meldungen · feste Aufzeichnung", "live-small") + "" + esc(phase_text) + "