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 00000000..3fc50e72 Binary files /dev/null and b/server/src/resource/MetasequoiaIME.ico differ 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";