From a087731f96d8882bad1ac4550d1b27612e50396a Mon Sep 17 00:00:00 2001 From: Mr-Wiseguy Date: Sun, 19 Jan 2025 21:00:05 -0500 Subject: [PATCH] Refactor Rml document handling to use new ContextId system (prompts currently unimplemented) --- CMakeLists.txt | 1 + assets/config_menu.rml | 6 +- include/recomp_ui.h | 167 +++--- src/game/input.cpp | 11 +- src/ui/core/ui_context.cpp | 45 +- src/ui/core/ui_context.h | 3 + src/ui/ui_config.cpp | 159 ++---- src/ui/ui_launcher.cpp | 25 +- src/ui/ui_renderer.cpp | 1001 ++---------------------------------- src/ui/ui_renderer.h | 35 ++ src/ui/ui_state.cpp | 745 +++++++++++++++++++++++++++ 11 files changed, 976 insertions(+), 1222 deletions(-) create mode 100644 src/ui/ui_renderer.h create mode 100644 src/ui/ui_state.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 56cae31..d87be15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,6 +164,7 @@ set (SOURCES ${CMAKE_SOURCE_DIR}/src/game/rom_decompression.cpp ${CMAKE_SOURCE_DIR}/src/ui/ui_renderer.cpp + ${CMAKE_SOURCE_DIR}/src/ui/ui_state.cpp ${CMAKE_SOURCE_DIR}/src/ui/ui_launcher.cpp ${CMAKE_SOURCE_DIR}/src/ui/ui_config.cpp ${CMAKE_SOURCE_DIR}/src/ui/ui_config_sub_menu.cpp diff --git a/assets/config_menu.rml b/assets/config_menu.rml index 70b799e..0f53941 100644 --- a/assets/config_menu.rml +++ b/assets/config_menu.rml @@ -33,7 +33,7 @@ -
+
@@ -118,7 +118,7 @@ -->
-