Changeset 386 for trunk

Timestamp:

Apr 27, 2021, 6:48:47 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Remove new key binding from other actions. So one shortcut can control one action.

Location:

trunk

Files:

• LocalPlayer/UKeyBindings.pas (modified) (2 diffs)
• Settings.pas (modified) (1 diff)

trunk/LocalPlayer/UKeyBindings.pas

@@ -37 +37 @@
     procedure Assign(Source: TKeyBindings);
     procedure ResetToDefault;
+    procedure RemoveShortCut(ShortCut: TShortCut);
   end;
 
@@ -271 +272 @@
   for I := 0 to Count - 1 do
     Items[I].SetDefault;
+end;
+
+procedure TKeyBindings.RemoveShortCut(ShortCut: TShortCut);
+var
+  I: Integer;
+begin
+  for I := 0 to Count - 1 do begin
+    if Items[I].ShortCut = ShortCut then Items[I].ShortCut := 0;
+    if Items[I].ShortCut2 = ShortCut then Items[I].ShortCut2 := 0;
+  end;
 end;
 

trunk/Settings.pas

@@ -244 +244 @@
 begin
   if Assigned(CurrentKeyBinding) then begin
+    if CurrentKeyBinding.ShortCut > 0 then
+      LocalKeyBindings.RemoveShortCut(CurrentKeyBinding.ShortCut);
+    if CurrentKeyBinding.ShortCut2 > 0 then
+      LocalKeyBindings.RemoveShortCut(CurrentKeyBinding.ShortCut2);
     CurrentKeyBinding.ShortCut := TextToShortCut(EditShortCutPrimary.Text);
     CurrentKeyBinding.ShortCut2 := TextToShortCut(EditShortCutSecondary.Text);