erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-11 10:07:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #11049 from keymanapp/fix/developer/11036-capture-alt-shortcuts-in-debugger

Browse source 
fix(developer): capture alt shortcuts in LDML keyboard debugger
This commit is contained in:
Marc Durdin 2024-03-25 14:05:56 +11:00 • committed by GitHub
commit a0d99ba07f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
developer/src/tike/child/Keyman.Developer.UI.Debug.UfrmLdmlKeyboardDebug.pas
View file

@ -78,7 +78,8 @@ type
debugkeyboard: TDebugKeyboard;
FDefaultFont: Boolean;
FUIStatus: TLdmlDebugUIStatus;
FUIDisabled: Boolean;
FIgnoreNextUIKey: Boolean;
{ Deadkey member variables }
FSelectedDeadkey: TDeadKeyInfo;
@ -131,7 +132,6 @@ type
procedure ShowDebugForm;
procedure HideDebugForm;
function ShortcutDisabled(Key: Word): Boolean;
end;
implementation
@ -247,7 +247,10 @@ begin
WM_SYSKEYDOWN:
Handled := HandleMemoKeydown(Message);
WM_SYSCHAR:
Handled := FUIDisabled;
begin
Handled := FIgnoreNextUIKey;
FIgnoreNextUIKey := False;
end;
WM_CHAR:
Handled := True;
end;
@ -449,6 +452,7 @@ procedure TfrmLdmlKeyboardDebug.Run(vkey: Word);
msg: TMessage;
state: TMemoSelectionState;
begin
FIgnoreNextUIKey := False;
if (LOBYTE(dwData) < VK_F1) or (LOBYTE(dwData) > VK_F12) then
begin
flag := KEYFLAG_KEYMAN;
@ -532,7 +536,7 @@ var
state: TMemoSelectionState;
Adjustment: Integer;
begin
FUIDisabled := True;
FIgnoreNextUIKey := True;
actions := km_core_state_get_actions(FDebugCore.State);
if actions = nil then
@ -636,7 +640,6 @@ begin
finally
km_core_context_items_dispose(context_items);
FUIDisabled := False;
UpdateCharacterGrid;
// We want to refresh the memo and character grid for rapid typing
@ -814,23 +817,6 @@ begin
memoSelMove(memo);
end;
{-------------------------------------------------------------------------------
- Control captions -
------------------------------------------------------------------------------}
function TfrmLdmlKeyboardDebug.ShortcutDisabled(Key: Word): Boolean;
begin
Result := False;
if not FUIDisabled then Exit;
if Key in [VK_F1..VK_F12] then
Result := True
else if GetKeyState(VK_CONTROL) < 0 then
begin
if Key in [Ord('A')..Ord('Z'), Ord('0')..Ord('9')] then
Result := True;
end;
end;
procedure TfrmLdmlKeyboardDebug.memoSelMove(Sender: TObject);
begin
if memo.Focused then

19
developer/src/tike/child/UfrmDebug.pas
View file

@ -191,8 +191,6 @@ type
procedure ListBreakpoints;
function ShortcutDisabled(Key: Word): Boolean;
property CurrentEvent: TDebugEvent read GetCurrentEvent;
property OnSetBreakpoint: TDebugLineEvent read FOnSetBreakpoint write FOnSetBreakpoint;
@ -1324,23 +1322,6 @@ begin
memoSelMove(memo);
end;
{-------------------------------------------------------------------------------
- Control captions -
------------------------------------------------------------------------------}
function TfrmDebug.ShortcutDisabled(Key: Word): Boolean;
begin
Result := False;
if not FUIDisabled then Exit;
if Key in [VK_F1..VK_F12] then
Result := True
else if GetKeyState(VK_CONTROL) < 0 then
begin
if Key in [Ord('A')..Ord('Z'), Ord('0')..Ord('9')] then
Result := True;
end;
end;
procedure TfrmDebug.memoSelMove(Sender: TObject);
begin
if memo.Focused then