Merge branch 'development' into VisualScripting

This commit is contained in:
Robert committed 2021-09-30 16:56:19 +02:00
commit 4f5d76de88
23 files changed
+554 -469

No files matched your search

@@ -16,5 +16,5 @@
VerticalAlignment="Center"
materialDesign:TextFieldAssist.HasClearButton="True"
materialDesign:HintAssist.Hint="{Binding Hint}"
KeyUp="{s:Action TextBoxKeyUp}"/>
KeyDown="{s:Action TextBoxKeyDown}"/>
</UserControl>
@@ -59,7 +59,7 @@ namespace Artemis.UI.Screens.Sidebar.Dialogs.ProfileEdit
Hint = "Toggle hotkey";
}
public void TextBoxKeyUp(object sender, KeyEventArgs e)
public void TextBoxKeyDown(object sender, KeyEventArgs e)
{
if (e.Key >= Key.LeftShift && e.Key <= Key.RightAlt)
return;