pulling in non-lua changes

beyond-all-reason · Apr 5, 2024 · fc1bb20 · fc1bb20
1 parent 36733e1
commit fc1bb20
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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)
-Original file line number
+Diff line change
@@ Expand Up / @@ -822,6 +822,7 @@ void CGame::LoadInterface() @@
     		GameSetupDrawer::Disable();
     		GameSetupDrawer::Enable();
     	}
     	RmlGui::Initialize(globalRendering->GetWindow(), globalRendering->GetContext(), globalRendering->winSizeX, globalRendering->winSizeY);
     }
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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)