From 92726664771503f7ea09786401ed0db5f52d4d78 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 30 Mar 2022 17:55:23 +0300 Subject: fix for pressing Enter in the middle of SRMM entry field --- src/mir_app/src/srmm_base.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp index 364d5d6ede..34f00c2d44 100644 --- a/src/mir_app/src/srmm_base.cpp +++ b/src/mir_app/src/srmm_base.cpp @@ -182,6 +182,15 @@ LRESULT CSrmmBaseDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam) return 1; break; } + + case WM_KEYDOWN: + MSG tmp = { m_hwnd, msg, wParam, lParam }; + if (Hotkey_Check(&tmp, g_pszHotkeySection) == 100) { + if (!(GetWindowLongPtr(m_message.GetHwnd(), GWL_STYLE) & ES_READONLY)) { + PostMessage(m_hwnd, WM_COMMAND, IDOK, 0); + return true; + } + } } LRESULT res = mir_callNextSubclass(m_message.GetHwnd(), stubMessageProc, msg, wParam, lParam); @@ -204,16 +213,6 @@ LRESULT CSrmmBaseDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam) } } - { - MSG tmp = { m_hwnd, msg, wParam, lParam }; - if (Hotkey_Check(&tmp, g_pszHotkeySection) == 100) { - if (!(GetWindowLongPtr(m_message.GetHwnd(), GWL_STYLE) & ES_READONLY)) { - PostMessage(m_hwnd, WM_COMMAND, IDOK, 0); - return true; - } - } - } - __fallthrough; case WM_SYSKEYDOWN: -- cgit v1.2.3