From bf167f31c7779a473a2586290a82a65afc18b720 Mon Sep 17 00:00:00 2001 From: thecozies <79979276+thecozies@users.noreply.github.com> Date: Sat, 20 Apr 2024 10:22:46 -0500 Subject: [PATCH] Updated rmlui to master --- CMakeLists.txt | 12 +- assets/config_menu.rml | 7 +- assets/config_menu/general.rml | 8 +- assets/recomp.rcss | 2 +- assets/scss/styles/components/Config.scss | 3 + lib/RmlUi | 2 +- lib/lunasvg | 2 +- .../FontEngineInterfaceScaled.cpp | 100 --- .../FontEngineInterfaceScaled.h | 75 --- src/ui/FontEngineScaled/FontFace.cpp | 95 --- src/ui/FontEngineScaled/FontFace.h | 74 --- .../FontEngineScaled/FontFaceHandleScaled.cpp | 487 -------------- .../FontEngineScaled/FontFaceHandleScaled.h | 157 ----- src/ui/FontEngineScaled/FontFaceLayer.cpp | 275 -------- src/ui/FontEngineScaled/FontFaceLayer.h | 138 ---- src/ui/FontEngineScaled/FontFamily.cpp | 97 --- src/ui/FontEngineScaled/FontFamily.h | 82 --- src/ui/FontEngineScaled/FontProvider.cpp | 268 -------- src/ui/FontEngineScaled/FontProvider.h | 102 --- src/ui/FontEngineScaled/FontTypes.h | 58 -- src/ui/FontEngineScaled/FreeTypeInterface.cpp | 602 ------------------ src/ui/FontEngineScaled/FreeTypeInterface.h | 73 --- src/ui/ScaledSVG/ElementScaledSVG.cpp | 216 ------- src/ui/ScaledSVG/ElementScaledSVG.h | 98 --- src/ui/ui_color_hack.cpp | 7 +- src/ui/ui_renderer.cpp | 62 +- 26 files changed, 32 insertions(+), 3070 deletions(-) delete mode 100644 src/ui/FontEngineScaled/FontEngineInterfaceScaled.cpp delete mode 100644 src/ui/FontEngineScaled/FontEngineInterfaceScaled.h delete mode 100644 src/ui/FontEngineScaled/FontFace.cpp delete mode 100644 src/ui/FontEngineScaled/FontFace.h delete mode 100644 src/ui/FontEngineScaled/FontFaceHandleScaled.cpp delete mode 100644 src/ui/FontEngineScaled/FontFaceHandleScaled.h delete mode 100644 src/ui/FontEngineScaled/FontFaceLayer.cpp delete mode 100644 src/ui/FontEngineScaled/FontFaceLayer.h delete mode 100644 src/ui/FontEngineScaled/FontFamily.cpp delete mode 100644 src/ui/FontEngineScaled/FontFamily.h delete mode 100644 src/ui/FontEngineScaled/FontProvider.cpp delete mode 100644 src/ui/FontEngineScaled/FontProvider.h delete mode 100644 src/ui/FontEngineScaled/FontTypes.h delete mode 100644 src/ui/FontEngineScaled/FreeTypeInterface.cpp delete mode 100644 src/ui/FontEngineScaled/FreeTypeInterface.h delete mode 100644 src/ui/ScaledSVG/ElementScaledSVG.cpp delete mode 100644 src/ui/ScaledSVG/ElementScaledSVG.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 71fe346..defa53c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,7 @@ set(BUILD_SHARED_LIBS OFF) SET(LUNASVG_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) add_subdirectory(${CMAKE_SOURCE_DIR}/lib/lunasvg) # set(BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS_SAVED}") -SET(ENABLE_SVG_PLUGIN OFF CACHE BOOL "" FORCE) +SET(ENABLE_SVG_PLUGIN ON CACHE BOOL "" FORCE) add_subdirectory(${CMAKE_SOURCE_DIR}/lib/RmlUi) target_include_directories(rt64 PRIVATE ${CMAKE_BINARY_DIR}/rt64/src) @@ -144,17 +144,7 @@ set (SOURCES ${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 - ${CMAKE_SOURCE_DIR}/src/ui/FontEngineScaled/FontFaceHandleScaled.cpp - ${CMAKE_SOURCE_DIR}/src/ui/FontEngineScaled/FontFaceLayer.cpp - ${CMAKE_SOURCE_DIR}/src/ui/FontEngineScaled/FontFamily.cpp - ${CMAKE_SOURCE_DIR}/src/ui/FontEngineScaled/FontProvider.cpp - ${CMAKE_SOURCE_DIR}/src/ui/FontEngineScaled/FreeTypeInterface.cpp - ${CMAKE_SOURCE_DIR}/src/ui/ScaledSVG/ElementScaledSVG.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 97cd147..542d9b0 100644 --- a/assets/config_menu.rml +++ b/assets/config_menu.rml @@ -101,15 +101,16 @@ --> -