From 058e036a554d822814ec510f2cc9a552747f8cae Mon Sep 17 00:00:00 2001 From: Ying Gao Date: Sun, 13 Jul 2025 16:31:27 +0800 Subject: [PATCH 1/2] Add arena mode focus strings for widgets --- library/modules/Gui.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp index f71654c024..dedcc6cdbc 100644 --- a/library/modules/Gui.cpp +++ b/library/modules/Gui.cpp @@ -90,6 +90,7 @@ distribution. #include "df/viewscreen_dungeonmodest.h" #include "df/viewscreen_dwarfmodest.h" #include "df/viewscreen_legendsst.h" +#include "df/viewscreen_new_arenast.h" #include "df/viewscreen_new_regionst.h" #include "df/viewscreen_setupdwarfgamest.h" #include "df/viewscreen_titlest.h" @@ -188,6 +189,18 @@ DEFINE_GET_FOCUS_STRING_HANDLER(new_region) focusStrings.push_back(baseFocus); } +DEFINE_GET_FOCUS_STRING_HANDLER(new_arena) +{ + if (screen->raw_load) + focusStrings.push_back(baseFocus + "/Loading"); + else if (screen->doing_mods) + focusStrings.push_back(baseFocus + "/Mods"); + + if (focusStrings.empty()) + focusStrings.push_back(baseFocus); + +} + DEFINE_GET_FOCUS_STRING_HANDLER(choose_start_site) { if (screen->doing_site_finder) From 5d7968bdfa1fcc3fdd8736a90ef35de44f0f723f Mon Sep 17 00:00:00 2001 From: Ying Gao Date: Sun, 13 Jul 2025 16:42:17 +0800 Subject: [PATCH 2/2] Update changelog --- docs/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog.txt b/docs/changelog.txt index 0fa2e9535a..49887c54ad 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -35,6 +35,7 @@ Template for new versions: ## Documentation ## API +- Added GUI focus strings for new_arena: ``/Loading`` and ``/Mods`` ## Lua