From fc1bb20fa2e41c0aacdc5dd5dfae8a8fe0aafc8d Mon Sep 17 00:00:00 2001 From: ChrisClark13 Date: Tue, 30 Jan 2024 17:50:42 -0700 Subject: [PATCH] pulling in non-lua changes --- rts/Game/Game.cpp | 1 + rts/Game/UI/MouseHandler.cpp | 3 ++- rts/builds/headless/CMakeLists.txt | 1 - rts/builds/legacy/CMakeLists.txt | 1 - rts/lib/CMakeLists.txt | 2 -- 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/rts/Game/Game.cpp b/rts/Game/Game.cpp index 2327d0d27c..c5c32d1279 100644 --- a/rts/Game/Game.cpp +++ b/rts/Game/Game.cpp @@ -822,6 +822,7 @@ void CGame::LoadInterface() GameSetupDrawer::Disable(); GameSetupDrawer::Enable(); } + RmlGui::Initialize(globalRendering->GetWindow(), globalRendering->GetContext(), globalRendering->winSizeX, globalRendering->winSizeY); } diff --git a/rts/Game/UI/MouseHandler.cpp b/rts/Game/UI/MouseHandler.cpp index 133ef7a624..5e57a1985c 100644 --- a/rts/Game/UI/MouseHandler.cpp +++ b/rts/Game/UI/MouseHandler.cpp @@ -274,7 +274,8 @@ void CMouseHandler::MouseMove(int x, int y, int dx, int dy) playerHandler.Player(gu->myPlayerNum)->currentStats.mousePixels += movedPixels; /* Only want to give a mouse event to RmlUI if the mouse isn't currently performing a drag. - * Otherwise box selections get stuck when the mouse goes over an Rml element. */ + * Otherwise box selections get stuck when the mouse goes over an Rml element. + * Flags that ButtonPressed() checks are not set when clicking on Rml element. */ if (!ButtonPressed() && RmlGui::ProcessMouseMove(x, lasty, dx, dy, activeButtonIdx)) { return; } diff --git a/rts/builds/headless/CMakeLists.txt b/rts/builds/headless/CMakeLists.txt index 93d17b2312..72c9fd31d3 100644 --- a/rts/builds/headless/CMakeLists.txt +++ b/rts/builds/headless/CMakeLists.txt @@ -29,7 +29,6 @@ list(APPEND engineHeadlessLibraries engineSim) list(APPEND engineHeadlessLibraries pr-downloader) list(APPEND engineHeadlessLibraries RmlCore) list(APPEND engineHeadlessLibraries RmlDebugger) -list(APPEND engineHeadlessLibraries RmlSolLua) list(APPEND engineHeadlessLibraries lunasvg) include_directories(${ENGINE_SRC_ROOT_DIR}/lib/assimp/include) diff --git a/rts/builds/legacy/CMakeLists.txt b/rts/builds/legacy/CMakeLists.txt index f0648f572b..04e1e1c4dd 100644 --- a/rts/builds/legacy/CMakeLists.txt +++ b/rts/builds/legacy/CMakeLists.txt @@ -67,7 +67,6 @@ list(APPEND engineLibraries engineSim) list(APPEND engineLibraries pr-downloader) list(APPEND engineLibraries RmlCore) list(APPEND engineLibraries RmlDebugger) -list(APPEND engineLibraries RmlSolLua) list(APPEND engineLibraries lunasvg) ### Assemble external incude dirs diff --git a/rts/lib/CMakeLists.txt b/rts/lib/CMakeLists.txt index 8891e2281d..62633288a1 100644 --- a/rts/lib/CMakeLists.txt +++ b/rts/lib/CMakeLists.txt @@ -107,5 +107,3 @@ set(CMAKE_CXX_FLAGS ${SAVED_CMAKE_FLAGS}) option(ENABLE_SVG_PLUGIN "RmlUi with SVG support" ON) add_subdirectory(RmlUi) - -add_subdirectory(RmlSolLua)