Update font settings. Runtime font loading. etc..

Author: zcube

.gitignore

@@ -12,4 +12,5 @@ dist/*
 *.7z
 textures/out/*
 src/version
-prebuilt/*
+prebuilt/*
+/test/config.bat

dist/dist.bat

@@ -9,10 +9,10 @@ SET OWNER=ZCube
 SET REPO=ACTWebSocketOverlay
 
 echo ==========================================================================================
-@py -2 github_uploader.py %GITHUB_TOKEN% %OWNER% %REPO% %tag% ACTWebSocketOverlay_nonssl_%version%.zip
-REM @py -2 github_uploader.py %GITHUB_TOKEN% %OWNER% %REPO% %tag% ACTWebSocketOverlay_lua_nonssl_%version%.zip
-@py -2 github_uploader.py %GITHUB_TOKEN% %OWNER% %REPO% %tag% ACTWebSocketOverlay_ffxiv_nonssl_%version%.zip
-REM @py -2 github_uploader.py %GITHUB_TOKEN% %OWNER% %REPO% %tag% ACTWebSocketOverlay_ffxiv_lua_nonssl_%version%.zip
+REM @py -2 github_uploader.py %GITHUB_TOKEN% %OWNER% %REPO% %tag% ACTWebSocketOverlay_nonssl_%version%.zip
+@py -2 github_uploader.py %GITHUB_TOKEN% %OWNER% %REPO% %tag% ACTWebSocketOverlay_lua_nonssl_%version%.zip
+REM @py -2 github_uploader.py %GITHUB_TOKEN% %OWNER% %REPO% %tag% ACTWebSocketOverlay_ffxiv_nonssl_%version%.zip
+@py -2 github_uploader.py %GITHUB_TOKEN% %OWNER% %REPO% %tag% ACTWebSocketOverlay_ffxiv_lua_nonssl_%version%.zip
 echo ==========================================================================================
 
 :SetVariables
@@ -22,12 +22,11 @@ if exist "%LOCALAPPDATA%\Dropbox\info.json" SET DROP_INFO=%LOCALAPPDATA%\Dropbox
 for /f "tokens=*" %%a in ( 'powershell -NoProfile -ExecutionPolicy Bypass -Command "( ( Get-Content -Raw -Path %DROP_INFO% | ConvertFrom-Json ).personal.path)" ' ) do set dropBoxRoot=%%a
 echo %dropBoxRoot%
 
-REM lua has problems. on dx9
 if not exist "%dropBoxRoot%\share" mkdir "%dropBoxRoot%\share"
 if %errorlevel% neq 0 exit /b %errorlevel%
-xcopy /hrkysd  "%CD%\ACTWebSocketOverlay_nonssl_latest.zip" /exclude:exclude_files.txt "%dropBoxRoot%\share\ACTWebSocketOverlay_latest.zip"
+xcopy /hrkysd  "%CD%\ACTWebSocketOverlay_lua_nonssl_latest.zip" /exclude:exclude_files.txt "%dropBoxRoot%\share\ACTWebSocketOverlay_latest.zip"
 if %errorlevel% neq 0 exit /b %errorlevel%
-xcopy /hrkysd  "%CD%\ACTWebSocketOverlay_ffxiv_nonssl_latest.zip" /exclude:exclude_files.txt "%dropBoxRoot%\share\ACTWebSocketOverlay_ffxiv_latest.zip"
+xcopy /hrkysd  "%CD%\ACTWebSocketOverlay_lua_ffxiv_nonssl_latest.zip" /exclude:exclude_files.txt "%dropBoxRoot%\share\ACTWebSocketOverlay_ffxiv_latest.zip"
 if %errorlevel% neq 0 exit /b %errorlevel%
 copy /y "%CD%\..\src\version" "%dropBoxRoot%\share\ACTWebSocketOverlay_version"
 if %errorlevel% neq 0 exit /b %errorlevel%

external/reshade

@@ -84,7 +84,7 @@ class AWIOOverlay : public OverlayContextBase
 			ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.3, 0.3, 0.3, background_opacity * global_opacity));
 			ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.0, 0.0, 0.0, 0.0f));
 			ImGui::PushStyleColor(ImGuiCol_Text, ColorWithAlpha(preference_storage.color_map["TitleText"], text_opacity * global_opacity));
-			ImGui::Begin("AWIO", nullptr, options->windows_default_sizes["AWIO"], -1,
+			ImGui::Begin("AWIO", nullptr, options->GetDefaultSize("AWIO",ImVec2(500,200)), -1,
 				ImGuiWindowFlags_NoTitleBar | (use_input ? NULL : ImGuiWindowFlags_NoInputs));
 			options->windows_default_sizes["AWIO"] = ImGui::GetWindowSize();
 
@@ -97,6 +97,7 @@ class AWIOOverlay : public OverlayContextBase
 				auto resize_img = images->find("resize");
 				if (cog_img != images->end() && resize_img != images->end())
 				{
+					double scale = (io.Fonts->Fonts[0]->FontSize* io.FontGlobalScale) / cog_img->second.height / 1.5f;
 					ImGui::PushStyleColor(ImGuiCol_ChildWindowBg, ImVec4(0,0,0,0));
 					float icon_color_change = (cosf(GetTickCount() / 500.0f) + 1.0f) / 2.0f;
 					ImVec4 color = ColorWithAlpha(preference_storage.color_map["TitleText"], text_opacity * global_opacity);
@@ -106,21 +107,21 @@ class AWIOOverlay : public OverlayContextBase
 					auto p = ImGui::GetCursorPos();
 					ImGui::BeginChild("Btn",
 						//ImVec2(100,100),
-						ImVec2((cog_img->second.width + resize_img->second.width + 36) * io.FontGlobalScale / 6, (cog_img->second.height + 18) * io.FontGlobalScale / 6),
+						ImVec2((cog_img->second.width + 18) * scale, (cog_img->second.height + 18) * scale),
 						false,
 						ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse);
-					if (ImGui::ImageButton(texture, ImVec2(resize_img->second.width * io.FontGlobalScale / 6, resize_img->second.height * io.FontGlobalScale / 6), resize_img->second.uv0, resize_img->second.uv1, 2, ImVec4(0, 0, 0, 0), color))
+					if (ImGui::ImageButton(texture, ImVec2(resize_img->second.width * scale, resize_img->second.height * scale), resize_img->second.uv0, resize_img->second.uv1, 2, ImVec4(0, 0, 0, 0), color))
 					{
 						options->movable = !options->movable;
 					}
 					ImGui::EndChild();
-					ImGui::SameLine((cog_img->second.width + 18) * io.FontGlobalScale / 6);
+					ImGui::SameLine((cog_img->second.width + 18) * scale);
 					ImGui::BeginChild("Btn1",
 						//ImVec2(100,100),
-						ImVec2((cog_img->second.width + resize_img->second.width + 36) * io.FontGlobalScale / 6, (cog_img->second.height + 18) * io.FontGlobalScale / 6),
+						ImVec2((resize_img->second.width + 36) * scale, (cog_img->second.height + 18) * scale),
 						false,
 						ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse);
-					if (ImGui::ImageButton(texture, ImVec2(cog_img->second.width * io.FontGlobalScale / 6, cog_img->second.height * io.FontGlobalScale / 6), cog_img->second.uv0, cog_img->second.uv1, 2, ImVec4(0, 0, 0, 0), color))
+					if (ImGui::ImageButton(texture, ImVec2(cog_img->second.width * scale, cog_img->second.height * scale), cog_img->second.uv0, cog_img->second.uv1, 2, ImVec4(0, 0, 0, 0), color))
 					{
 						options->show_preferences = !options->show_preferences;
 					}