WIN32: Better support for IME

xfangfang · Jul 1, 2024 · f507b9b · f507b9b
1 parent 9b68e5d
commit f507b9b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/library/lib/extern/glfw b/library/lib/extern/glfw
diff --git a/library/lib/platforms/glfw/glfw_ime.cpp b/library/lib/platforms/glfw/glfw_ime.cpp
@@ -173,7 +173,11 @@ void GLFWImeManager::openInputDialog(std::function<void(std::string)> cb, std::s
     dialog->setHintText(subText);
     dialog->setHeaderText(headerText);
     dialog->setCountText(std::to_string(utf8len(initialText.data())) + "/" + std::to_string(maxStringLength));
+ #if defined(BOREALIS_USE_D3D11)
+    float scale = Application::windowScale;
+ #else
     float scale = Application::windowScale / Application::getPlatform()->getVideoContext()->getScaleFactor();
+#endif
     dialog->getLayoutEvent()->subscribe([this, scale](Point p)
         { glfwSetPreeditCursorRectangle(window, p.x * scale, p.y * scale, 1, 1); });
 

diff --git a/library/lib/platforms/sdl/sdl_ime.cpp b/library/lib/platforms/sdl/sdl_ime.cpp
@@ -139,7 +139,11 @@ namespace brls
         cursor = -1;
         updateText();
         if(!initialText.empty()) updateTextCursor();
+#if defined(BOREALIS_USE_D3D11)
+        float scale = Application::windowScale;
+ #else
         float scale = Application::windowScale / Application::getPlatform()->getVideoContext()->getScaleFactor();
+#endif
         // 更新输入法条位置
         dialog->getLayoutEvent()->subscribe([scale](Point p) {
 #ifndef PS4
+2 −0		src/win32_init.c
+3 −0		src/win32_platform.h
+4 −1		src/win32_window.c