From 2db14443740b97ca55a26da29d7ae91a9887d686 Mon Sep 17 00:00:00 2001 From: Xu Date: Sun, 2 Feb 2025 14:36:16 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E7=9B=B4=E6=8E=A5=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E8=BF=87=E7=A8=8B=E8=80=8C=E4=B8=8D=E6=98=AF?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Magpie/AutoStartHelper.cpp | 4 ++-- src/Magpie/MainWindow.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Magpie/AutoStartHelper.cpp b/src/Magpie/AutoStartHelper.cpp index a9323bef7..88011d25c 100644 --- a/src/Magpie/AutoStartHelper.cpp +++ b/src/Magpie/AutoStartHelper.cpp @@ -238,9 +238,9 @@ static bool CreateAutoStartTask(bool runElevated, const wchar_t* arguments) noex principal->put_LogonType(TASK_LOGON_INTERACTIVE_TOKEN); if (runElevated) { - hr = principal->put_RunLevel(_TASK_RUNLEVEL::TASK_RUNLEVEL_HIGHEST); + hr = principal->put_RunLevel(TASK_RUNLEVEL_HIGHEST); } else { - hr = principal->put_RunLevel(_TASK_RUNLEVEL::TASK_RUNLEVEL_LUA); + hr = principal->put_RunLevel(TASK_RUNLEVEL_LUA); } if (FAILED(hr)) { diff --git a/src/Magpie/MainWindow.cpp b/src/Magpie/MainWindow.cpp index 2762fe1fa..047756e25 100644 --- a/src/Magpie/MainWindow.cpp +++ b/src/Magpie/MainWindow.cpp @@ -456,9 +456,9 @@ LRESULT MainWindow::_TitleBarMessageHandler(UINT msg, WPARAM wParam, LPARAM lPar { POINT cursorPos{ GET_X_LPARAM(lParam),GET_Y_LPARAM(lParam) }; ClientToScreen(_hwndTitleBar.get(), &cursorPos); - wParam = SendMessage(_hwndTitleBar.get(), WM_NCHITTEST, 0, MAKELPARAM(cursorPos.x, cursorPos.y)); + wParam = _TitleBarMessageHandler(WM_NCHITTEST, 0, MAKELPARAM(cursorPos.x, cursorPos.y)); + [[fallthrough]]; } - [[fallthrough]]; case WM_NCMOUSEMOVE: { CaptionButtonsControl& captionButtons = Content()->TitleBar().CaptionButtons(); @@ -513,7 +513,7 @@ LRESULT MainWindow::_TitleBarMessageHandler(UINT msg, WPARAM wParam, LPARAM lPar Content()->TitleBar().CaptionButtons().LeaveButtons(); } else { // 然后检查鼠标在标题栏上的位置 - LRESULT hit = SendMessage(_hwndTitleBar.get(), WM_NCHITTEST, 0, MAKELPARAM(cursorPos.x, cursorPos.y)); + LRESULT hit = _TitleBarMessageHandler(WM_NCHITTEST, 0, MAKELPARAM(cursorPos.x, cursorPos.y)); if (hit != HTMINBUTTON && hit != HTMAXBUTTON && hit != HTCLOSE) { Content()->TitleBar().CaptionButtons().LeaveButtons(); } @@ -553,9 +553,9 @@ LRESULT MainWindow::_TitleBarMessageHandler(UINT msg, WPARAM wParam, LPARAM lPar POINT cursorPos{ GET_X_LPARAM(lParam),GET_Y_LPARAM(lParam) }; ClientToScreen(_hwndTitleBar.get(), &cursorPos); - wParam = SendMessage(_hwndTitleBar.get(), WM_NCHITTEST, 0, MAKELPARAM(cursorPos.x, cursorPos.y)); + wParam = _TitleBarMessageHandler(WM_NCHITTEST, 0, MAKELPARAM(cursorPos.x, cursorPos.y)); + [[fallthrough]]; } - [[fallthrough]]; case WM_NCLBUTTONUP: { // 处理鼠标在标题栏上释放。如果在标题栏按钮上，则通知 CaptionButtons，否则将消息传递给主窗口