From bd5ba1f7717e14581b4a087eb7fcbb7bc02c6aba Mon Sep 17 00:00:00 2001 From: fanlumaster <1730976608@qq.com> Date: Mon, 3 Nov 2025 13:12:51 +0800 Subject: [PATCH] [ui]: settings window --- server/CMakeLists.txt | 2 + server/html/webview2/menu/default.html | 2 +- server/html/webview2/settings/default.html | 278 ++++++++++++++------- server/scripts/config_files/CMakeLists.txt | 4 +- server/src/resource/MetasequoiaIME.ico | Bin 0 -> 38078 bytes server/src/resource/resource.h | 3 + server/src/resource/resource.rc | 3 + server/src/webview2/windows_webview2.cpp | 35 ++- server/src/window/ime_windows.cpp | 78 ++++-- server/src/window/ime_windows.h | 2 +- 10 files changed, 280 insertions(+), 127 deletions(-) create mode 100644 server/src/resource/MetasequoiaIME.ico create mode 100644 server/src/resource/resource.h create mode 100644 server/src/resource/resource.rc diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 9f8ccc3d..c9da5b02 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -49,6 +49,8 @@ set(SRC_FILES "./src/ipc/ipc.h" "./src/log/fanylog.cpp" "./src/log/fanylog.h" + "./src/resource/resource.h" + "./src/resource/resource.rc" "./src/utils/common_utils.cpp" "./src/utils/common_utils.h" "./src/utils/ime_utils.cpp" diff --git a/server/html/webview2/menu/default.html b/server/html/webview2/menu/default.html index 25e0fedf..3d5f6127 100644 --- a/server/html/webview2/menu/default.html +++ b/server/html/webview2/menu/default.html @@ -94,7 +94,7 @@ 🖲️ 悬浮工具栏 -
+
diff --git a/server/html/webview2/settings/default.html b/server/html/webview2/settings/default.html index 7b3fae2e..9e6a6da9 100644 --- a/server/html/webview2/settings/default.html +++ b/server/html/webview2/settings/default.html @@ -4,148 +4,236 @@ - 水杉输入法设置 + (IME)Settings -
-
外观
-
输入
-
快捷键
-
词库管理
-
皮肤
-
关于&反馈
-
-
-
-

候选字预览

-
- 1水杉 - 2水杉输入法 - 3连心 - 4为新 - 5唯心 - 6威 +
+
+
+ + 水杉输入法
+
通用
+
外观
+
输入
+
快捷键
+
词库管理
+
皮肤
+
帮助
+
关于
+
反馈
-
-

候选字大小

-
- 最小 - - 最大 +
+
+

默认主题模式

+ +
+ +
+

候选词预览

+
+ 水 + 杉 + 输入法 +
- -
-

主题模式

- -
+ + \ No newline at end of file diff --git a/server/scripts/config_files/CMakeLists.txt b/server/scripts/config_files/CMakeLists.txt index adbdc4a4..c9da5b02 100644 --- a/server/scripts/config_files/CMakeLists.txt +++ b/server/scripts/config_files/CMakeLists.txt @@ -49,6 +49,8 @@ set(SRC_FILES "./src/ipc/ipc.h" "./src/log/fanylog.cpp" "./src/log/fanylog.h" + "./src/resource/resource.h" + "./src/resource/resource.rc" "./src/utils/common_utils.cpp" "./src/utils/common_utils.h" "./src/utils/ime_utils.cpp" @@ -57,7 +59,7 @@ set(SRC_FILES "./src/utils/webview_utils.h" "./src/utils/window_utils.cpp" "./src/utils/window_utils.h" - "./src/window/candidate_window.cpp" + "./src/window/ime_windows.cpp" "./src/window/ime_windows.h" "./src/window/window_hook.cpp" "./src/window/window_hook.h" diff --git a/server/src/resource/MetasequoiaIME.ico b/server/src/resource/MetasequoiaIME.ico new file mode 100644 index 0000000000000000000000000000000000000000..3fc50e72a0e38dd9e40f83495ee10b0e463b85db GIT binary patch literal 38078 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 literal 0 HcmV?d00001 diff --git a/server/src/resource/resource.h b/server/src/resource/resource.h new file mode 100644 index 00000000..a4eca2fd --- /dev/null +++ b/server/src/resource/resource.h @@ -0,0 +1,3 @@ +#pragma once + +#define IDI_IME_ICON 101 // 注意，下面一定要有换行，这是 RC 编译器的要求 diff --git a/server/src/resource/resource.rc b/server/src/resource/resource.rc new file mode 100644 index 00000000..7fefc2dc --- /dev/null +++ b/server/src/resource/resource.rc @@ -0,0 +1,3 @@ +#include "resource.h" + +IDI_IME_ICON ICON "MetasequoiaIME.ico" \ No newline at end of file diff --git a/server/src/webview2/windows_webview2.cpp b/server/src/webview2/windows_webview2.cpp index b294d5e2..6817b9d1 100644 --- a/server/src/webview2/windows_webview2.cpp +++ b/server/src/webview2/windows_webview2.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include "global/globals.h" #include "fmt/xchar.h" @@ -556,10 +557,15 @@ HRESULT OnControllerCreatedSettingsWnd( // // Configure virtual host path if (SUCCEEDED(webviewSettingsWnd->QueryInterface(IID_PPV_ARGS(&webview3SettingsWnd)))) { + const std::wstring assetPath = fmt::format( // + L"{}\\{}\\html\\webview2\\settings", // + string_to_wstring(CommonUtils::get_local_appdata_path()), // + GlobalIme::AppName // + ); // Assets mapping webview3SettingsWnd->SetVirtualHostNameToFolderMapping( // - L"appassets", // - ::LocalAssetsPath.c_str(), // + L"imesettings", // + assetPath.c_str(), // COREWEBVIEW2_HOST_RESOURCE_ACCESS_KIND_DENY_CORS // ); // } @@ -574,17 +580,36 @@ HRESULT OnControllerCreatedSettingsWnd( // // Adjust to window size RECT bounds; GetClientRect(hwnd, &bounds); - bounds.right += boundRightExtra; - bounds.bottom += boundBottomExtra; webviewControllerSettingsWnd->put_Bounds(bounds); // Navigate to HTML - HRESULT hr = webviewSettingsWnd->NavigateToString(::HTMLStringSettingsWnd.c_str()); + // HRESULT hr = webviewSettingsWnd->NavigateToString(::HTMLStringSettingsWnd.c_str()); + std::wstring url = L"https://imesettings/default.html"; + HRESULT hr = webviewSettingsWnd->Navigate(url.c_str()); if (FAILED(hr)) { OutputDebugString(fmt::format(L"Failed to navigate to string.").c_str()); } + EventRegistrationToken navCompletedToken; + webviewSettingsWnd->add_NavigationCompleted( + Callback( // + [hwnd](ICoreWebView2 *sender, ICoreWebView2NavigationCompletedEventArgs *args) -> HRESULT { + BOOL success; + args->get_IsSuccess(&success); + if (success) + { + OutputDebugString(L"✅ WebView2 页面加载完成\n"); + // 在这里执行你想等页面准备好的逻辑，比如执行 JS 初始化 + + BOOL cloak = FALSE; + DwmSetWindowAttribute(hwnd, DWMWA_CLOAK, &cloak, sizeof(cloak)); + } + return S_OK; + }) + .Get(), + &navCompletedToken); + /* Debug console */ // webviewSettingsWindow->OpenDevToolsWindow(); diff --git a/server/src/window/ime_windows.cpp b/server/src/window/ime_windows.cpp index a290ee4a..1c8da557 100644 --- a/server/src/window/ime_windows.cpp +++ b/server/src/window/ime_windows.cpp @@ -18,6 +18,7 @@ #include "utils/ime_utils.h" #include "window_hook.h" #include +#include "resource/resource.h" #pragma comment(lib, "dwmapi.lib") @@ -46,7 +47,8 @@ LRESULT RegisterIMEWindowsClass(WNDCLASSEX &wcex, HINSTANCE hInstance) wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; wcex.hInstance = hInstance; - wcex.hIcon = LoadIcon(hInstance, IDI_APPLICATION); + wcex.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_IME_ICON)); + wcex.hIconSm = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_IME_ICON)); wcex.hCursor = LoadCursor(NULL, IDC_ARROW); /* We do not need background color, otherwise it will flash when rendering */ wcex.hbrBackground = NULL; @@ -156,34 +158,42 @@ int CreateCandidateWindow(HINSTANCE hInstance) // // settings 窗口 // - dwExStyle = WS_EX_LAYERED | // - WS_EX_APPWINDOW; // - DWORD styleSettingsWnd = WS_POPUP | // - WS_SYSMENU | // - WS_MINIMIZEBOX | // - WS_MAXIMIZEBOX; // - HWND hwnd_settings = CreateWindowEx( // - dwExStyle, // - szWindowClass, // - lpWindowNameSettings, // - styleSettingsWnd, // - 400, // - 400, // - (::SETTINGS_WINDOW_WIDTH)*scale, // - (::SETTINGS_WINDOW_HEIGHT)*scale, // - nullptr, // - nullptr, // - hInstance, // - nullptr // - ); // + dwExStyle = 0; // + HWND hwnd_settings = CreateWindowEx( // + dwExStyle, // + szWindowClass, // + lpWindowNameSettings, // + WS_OVERLAPPEDWINDOW, // + 400, // + 400, // + (::SETTINGS_WINDOW_WIDTH)*scale, // + (::SETTINGS_WINDOW_HEIGHT)*scale, // + nullptr, // + nullptr, // + hInstance, // + nullptr // + ); // if (!hwnd_settings) { OutputDebugString(fmt::format(L"Call to CreateWindow for settings failed!\n").c_str()); return 1; } - MARGINS m_settings{-1}; // 全部填满 - DwmExtendFrameIntoClientArea(hwnd_settings, &m_settings); + // 使用 DWM 允许透明 + DWM_BLURBEHIND bb = {0}; + bb.dwFlags = DWM_BB_ENABLE; + bb.fEnable = TRUE; + bb.hRgnBlur = nullptr; + DwmEnableBlurBehindWindow(hwnd_settings, &bb); + BOOL useDarkMode = TRUE; + DwmSetWindowAttribute( // + hwnd_settings, // + DWMWA_USE_IMMERSIVE_DARK_MODE, // + &useDarkMode, // + sizeof(useDarkMode) // + ); ::global_hwnd_settings = hwnd_settings; + BOOL cloak = TRUE; + DwmSetWindowAttribute(hwnd_settings, DWMWA_CLOAK, &cloak, sizeof(cloak)); // // floating toolbar 窗口 @@ -218,7 +228,8 @@ int CreateCandidateWindow(HINSTANCE hInstance) // ShowWindow(hwnd, SW_SHOW); ShowWindow(hwnd_menu, SW_SHOW); - ShowWindow(hwnd_settings, SW_SHOW); + ShowWindow(hwnd_settings, SW_SHOWMINIMIZED); + ShowWindow(hwnd_settings, SW_RESTORE); ShowWindow(hwnd_ftb, SW_SHOW); UpdateWindow(hwnd); UpdateWindow(hwnd_menu); @@ -479,6 +490,25 @@ LRESULT CALLBACK WndProcSettingsWindow(HWND hwnd, UINT message, WPARAM wParam, L { switch (message) { + case WM_ERASEBKGND: { // Make the background dark + // HDC hdc = (HDC)wParam; + // RECT rc; + // GetClientRect(hwnd, &rc); + + // HBRUSH darkBrush = CreateSolidBrush(RGB(32, 32, 32)); + // FillRect(hdc, &rc, darkBrush); + // DeleteObject(darkBrush); + return 1; + } + case WM_SIZE: { + if (::webviewControllerSettingsWnd) + { + RECT rect; + GetClientRect(hwnd, &rect); + webviewControllerSettingsWnd->put_Bounds(rect); + } + break; + } default: { return DefWindowProc(hwnd, message, wParam, lParam); } diff --git a/server/src/window/ime_windows.h b/server/src/window/ime_windows.h index 975160a7..bf3c4a38 100644 --- a/server/src/window/ime_windows.h +++ b/server/src/window/ime_windows.h @@ -9,7 +9,7 @@ inline WCHAR lpWindowNameCand[] = L"metaseuqoiaimecandwnd"; /* 菜单窗口 */ inline WCHAR lpWindowNameMenu[] = L"metaseuqoiaimemenuwnd"; /* settings 窗口 */ -inline WCHAR lpWindowNameSettings[] = L"metaseuqoiaimesettingswnd"; +inline WCHAR lpWindowNameSettings[] = L"Settings"; /* floating toolbar 窗口 */ inline WCHAR lpWindowNameFtb[] = L"metaseuqoiaimeftbwnd";