From 4e710c7d2f1df7571bd017599f659595562c63d3 Mon Sep 17 00:00:00 2001 From: Dario Date: Wed, 8 Jan 2025 21:14:55 -0300 Subject: [PATCH] Rewrite mod details under new UI system. --- CMakeLists.txt | 8 +- assets/config_menu.rml | 10 +- assets/config_menu/mods.rml | 9 + assets/launcher.rml | 5 +- assets/recomp.rcss | 2587 ++++++++++++++++- assets/scss/styles/components/ModDetails.scss | 74 - assets/scss/styles/components/ModMenu.scss | 56 +- .../scss/styles/components/_components.scss | 1 - include/recomp_ui.h | 1 + src/ui/elements/ElementModDetailsPanel.cpp | 72 - src/ui/elements/ElementModDetailsPanel.h | 24 - src/ui/elements/ElementModMenu.cpp | 51 +- src/ui/elements/ElementModMenu.h | 5 +- src/ui/elements/ui_button.cpp | 69 + src/ui/elements/ui_button.h | 28 + src/ui/elements/ui_container.cpp | 14 + src/ui/elements/ui_container.h | 12 + src/ui/elements/ui_element.cpp | 415 +++ src/ui/elements/ui_element.h | 211 ++ src/ui/elements/ui_image.cpp | 11 + src/ui/elements/ui_image.h | 12 + src/ui/elements/ui_label.cpp | 29 + src/ui/elements/ui_label.h | 18 + src/ui/elements/ui_mod_details_panel.cpp | 73 + src/ui/elements/ui_mod_details_panel.h | 37 + src/ui/elements/ui_toggle.cpp | 82 + src/ui/elements/ui_toggle.h | 27 + src/ui/ui_elements.cpp | 1 - src/ui/ui_elements.h | 1 - src/ui/ui_launcher.cpp | 6 + src/ui/ui_renderer.cpp | 193 +- 31 files changed, 3765 insertions(+), 377 deletions(-) create mode 100644 assets/config_menu/mods.rml delete mode 100644 assets/scss/styles/components/ModDetails.scss delete mode 100644 src/ui/elements/ElementModDetailsPanel.cpp delete mode 100644 src/ui/elements/ElementModDetailsPanel.h create mode 100644 src/ui/elements/ui_button.cpp create mode 100644 src/ui/elements/ui_button.h create mode 100644 src/ui/elements/ui_container.cpp create mode 100644 src/ui/elements/ui_container.h create mode 100644 src/ui/elements/ui_element.cpp create mode 100644 src/ui/elements/ui_element.h create mode 100644 src/ui/elements/ui_image.cpp create mode 100644 src/ui/elements/ui_image.h create mode 100644 src/ui/elements/ui_label.cpp create mode 100644 src/ui/elements/ui_label.h create mode 100644 src/ui/elements/ui_mod_details_panel.cpp create mode 100644 src/ui/elements/ui_mod_details_panel.h create mode 100644 src/ui/elements/ui_toggle.cpp create mode 100644 src/ui/elements/ui_toggle.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 1713919..37e088f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,8 +172,14 @@ set (SOURCES ${CMAKE_SOURCE_DIR}/src/ui/elements/ElementOptionTypeRange.cpp ${CMAKE_SOURCE_DIR}/src/ui/elements/ElementOptionTypeTextField.cpp ${CMAKE_SOURCE_DIR}/src/ui/elements/ElementModMenu.cpp - ${CMAKE_SOURCE_DIR}/src/ui/elements/ElementModDetailsPanel.cpp ${CMAKE_SOURCE_DIR}/src/ui/elements/presets.cpp + ${CMAKE_SOURCE_DIR}/src/ui/elements/ui_button.cpp + ${CMAKE_SOURCE_DIR}/src/ui/elements/ui_container.cpp + ${CMAKE_SOURCE_DIR}/src/ui/elements/ui_element.cpp + ${CMAKE_SOURCE_DIR}/src/ui/elements/ui_image.cpp + ${CMAKE_SOURCE_DIR}/src/ui/elements/ui_label.cpp + ${CMAKE_SOURCE_DIR}/src/ui/elements/ui_mod_details_panel.cpp + ${CMAKE_SOURCE_DIR}/src/ui/elements/ui_toggle.cpp ${CMAKE_SOURCE_DIR}/rsp/aspMain.cpp ${CMAKE_SOURCE_DIR}/rsp/njpgdspMain.cpp diff --git a/assets/config_menu.rml b/assets/config_menu.rml index c8609bc..d18d254 100644 --- a/assets/config_menu.rml +++ b/assets/config_menu.rml @@ -26,7 +26,8 @@ - + + @@ -65,6 +66,13 @@