From 48a248247231bc8a7d57d3aee94a7f89db98458e Mon Sep 17 00:00:00 2001 From: fanlusky <1730976608@qq.com> Date: Sat, 18 Jul 2026 16:04:40 +0800 Subject: [PATCH] Integrate the on-screen keyboard into the settings. --- server/CMakeLists.txt | 3 +++ server/src/settings/settings_app.cpp | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index a0addb66..9e497aff 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -210,6 +210,8 @@ target_link_libraries(${PROJECT_NAME} PRIVATE set(SETTINGS_EXECUTABLE_NAME "MetasequoiaImeSettings") add_executable(${SETTINGS_EXECUTABLE_NAME} WIN32 "./src/settings/settings_app.cpp" + "./src/settings/settings_launcher.cpp" + "./src/settings/settings_launcher.h" "./src/config/ime_config.cpp" "./src/config/ime_config.h" "./src/utils/common_utils.cpp" @@ -227,6 +229,7 @@ target_link_libraries(${SETTINGS_EXECUTABLE_NAME} PRIVATE nlohmann_json::nlohmann_json dwmapi dcomp + shell32 $<$:${WEBVIEW2_LOADER_DEBUG}> $<$:${WEBVIEW2_LOADER_RELEASE}> ) diff --git a/server/src/settings/settings_app.cpp b/server/src/settings/settings_app.cpp index 401780db..dded4c4d 100644 --- a/server/src/settings/settings_app.cpp +++ b/server/src/settings/settings_app.cpp @@ -1,6 +1,7 @@ #include "config/ime_config.h" #include "global/globals.h" #include "resource/resource.h" +#include "settings/settings_launcher.h" #include "utils/common_utils.h" #include @@ -331,6 +332,10 @@ void HandleWebMessage(HWND hwnd, ICoreWebView2WebMessageReceivedEventArgs *args) { PostConfig(); } + else if (type == "openKeyboardPanel") + { + OpenKeyboardPanelApplication(); + } } catch (const std::exception &) {