Merge pull request #13131 from keymanapp/fix/developer/13052-support-non-us-base-keyboard-in-debugger

fix(developer): support non-US base keyboard layouts in debuggers
This commit is contained in:
Marc Durdin 2025-02-10 08:19:04 +07:00 • committed by GitHub
commit b9c0c180db
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions

View file

@ -39,7 +39,7 @@ uses
UframeTextEditor,
UfrmMDIEditor,
UfrmTike,
UserMessages;
UserMessages, Keyman.Developer.UI.RichEdit41;
type
TLdmlDebugUIStatus = (
@ -340,7 +340,7 @@ begin
if not SetKeyEventContext then
Exit(False);
if km_core_process_event(FDebugCore.State, Message.WParam, modifier, 1, KM_CORE_EVENT_FLAG_DEFAULT) = KM_CORE_STATUS_OK then
if km_core_process_event(FDebugCore.State, VKToScanCodeToVK(Message.WParam, GetKeyboardLayout(0)), modifier, 1, KM_CORE_EVENT_FLAG_DEFAULT) = KM_CORE_STATUS_OK then
begin
// Process keystroke -- true = swallow keystroke
Result := True;

View file

@ -41,7 +41,7 @@ uses
UfrmDebugStatus,
UfrmMDIEditor,
UfrmTike,
UserMessages;
UserMessages, Keyman.Developer.UI.RichEdit41;
type
TDebugLineEvent = procedure(Sender: TObject; ALine: Integer) of object;
@ -465,7 +465,7 @@ begin
if not SetKeyEventContext then
Exit(False);
if km_core_process_event(FDebugCore.State, Message.WParam, modifier, 1, KM_CORE_EVENT_FLAG_DEFAULT) = KM_CORE_STATUS_OK then
if km_core_process_event(FDebugCore.State, VKToScanCodeToVK(Message.WParam, GetKeyboardLayout(0)), modifier, 1, KM_CORE_EVENT_FLAG_DEFAULT) = KM_CORE_STATUS_OK then
begin
// Process keystroke -- true = swallow keystroke
Result := True;