remote: Simplify DPI: add SetFullDPISettings

pthom · Apr 17, 2024 · 9a92952 · 9a92952
1 parent 6a332e6
commit 9a92952
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 19 deletions.
diff --git a/external/netImgui b/external/netImgui
diff --git a/src/hello_imgui/internal/backend_impls/abstract_runner.cpp b/src/hello_imgui/internal/backend_impls/abstract_runner.cpp
@@ -474,21 +474,7 @@ bool _CheckDpiAwareParamsChanges(HelloImGui::RunnerParams& params)
 		dpiAwareParams.fontRenderingScale = io.FontGlobalScale;
 	}
 
-	bool didDpiWindowSizeFactorChange = false;
-#ifdef HELLOIMGUI_WITH_NETIMGUI
-	if (params.remoteParams.enableRemoting)
-	{
-		float newWindowDPISizeFactor = NetImgui::GetWindowDPISizeFactor();
-		didDpiWindowSizeFactorChange = dpiAwareParams.dpiWindowSizeFactor != newWindowDPISizeFactor;
-		if (didDpiWindowSizeFactorChange)
-		{
-			printf("Warning: didDpiWindowSizeFactorChange=:true (from netImgui)\n");
-			dpiAwareParams.dpiWindowSizeFactor = newWindowDPISizeFactor;
-		}
-	}
-#endif
-
-	if (didDpiWindowSizeFactorChange || didFontGlobalScaleChange)
+	if (didFontGlobalScaleChange)
 	{
 		printf("New DpiAwareParams:\n");
 		_LogDpiParams("_CheckDpiAwareParamsChanges (changed!)", dpiAwareParams);

diff --git a/src/netimgui_remote_display/netimgui_remote_display.cpp b/src/netimgui_remote_display/netimgui_remote_display.cpp
@@ -44,13 +44,16 @@ int main(int argc, char **argv)
 
     runnerParams.callbacks.PostInit = [&pass_cmd_line_args_to_server]() {
         pass_cmd_line_args_to_server();
-		NetImguiServer::UI::SetUseServerDisplayDPISettings(true);
-		float windowDPISizeFactor = HelloImGui::GetRunnerParams()->dpiAwareParams.dpiWindowSizeFactor;
-		NetImguiServer::UI::SetWindowDPISizeFactor(windowDPISizeFactor);
+        // KK3 set font scale here
     };
 
     runnerParams.callbacks.PreNewFrame = []() {
         // Request each client to update their drawing content
+        NetImguiServer::UI::SetFullDPISettings(
+            ImGui::GetIO().DisplayFramebufferScale,
+            1.f / HelloImGui::DpiFontLoadingFactor()
+        );
+
         NetImguiServer::App::UpdateRemoteContent();
     };
+0 −3		Code/Client/NetImgui_Api.h
+0 −10		Code/Client/Private/NetImgui_Api.cpp
+0 −2		Code/Client/Private/NetImgui_CmdPackets.h
+1 −1		Code/ServerApp/Source/NetImguiServer_App.cpp
+6 −26		Code/ServerApp/Source/NetImguiServer_RemoteClient.cpp
+34 −42		Code/ServerApp/Source/NetImguiServer_UI.cpp
+4 −19		Code/ServerApp/Source/NetImguiServer_UI.h