From 95ab0074ea4f55f6ab0f0c1eaa823d8f384a004b Mon Sep 17 00:00:00 2001 From: thecozies <79979276+thecozies@users.noreply.github.com> Date: Thu, 18 Apr 2024 09:42:39 -0500 Subject: [PATCH] fix and improve kb/cont config tab > panel navigation prompt component - wip --- CMakeLists.txt | 1 + assets/components/prompt.rml | 30 +++++ assets/config_menu.rml | 14 ++- assets/config_menu/controls.rml | 2 +- assets/config_menu/debug.rml | 2 +- assets/recomp.rcss | 2 +- assets/scss/styles/components/Prompt.scss | 57 ++++++++++ .../scss/styles/components/_components.scss | 3 +- src/ui/ui_renderer.cpp | 42 ++++++- src/ui/ui_rml_hacks.cpp | 106 ++++++++++++++++++ src/ui/ui_rml_hacks.hpp | 9 ++ 11 files changed, 260 insertions(+), 8 deletions(-) create mode 100644 assets/components/prompt.rml create mode 100644 assets/scss/styles/components/Prompt.scss create mode 100644 src/ui/ui_rml_hacks.cpp create mode 100644 src/ui/ui_rml_hacks.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index e01f0cc..71fe346 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -143,6 +143,7 @@ set (SOURCES ${CMAKE_SOURCE_DIR}/src/ui/ui_launcher.cpp ${CMAKE_SOURCE_DIR}/src/ui/ui_config.cpp ${CMAKE_SOURCE_DIR}/src/ui/ui_color_hack.cpp + ${CMAKE_SOURCE_DIR}/src/ui/ui_rml_hacks.cpp ${CMAKE_SOURCE_DIR}/src/ui/FontEngineScaled/FontEngineInterfaceScaled.cpp ${CMAKE_SOURCE_DIR}/src/ui/FontEngineScaled/FontFace.cpp diff --git a/assets/components/prompt.rml b/assets/components/prompt.rml new file mode 100644 index 0000000..8b622ab --- /dev/null +++ b/assets/components/prompt.rml @@ -0,0 +1,30 @@ + diff --git a/assets/config_menu.rml b/assets/config_menu.rml index 0511d2f..97cd147 100644 --- a/assets/config_menu.rml +++ b/assets/config_menu.rml @@ -28,6 +28,7 @@ + @@ -42,7 +43,7 @@