mirror of
https://github.com/Artemis-RGB/Artemis
synced 2026-11-12 20:06:33 +00:00
Merge branch 'development' into VisualScripting
This commit is contained in:
commit
4f5d76de88
23 files changed
+554
-469
No files matched your search
+1
-1
@@ -16,5 +16,5 @@
|
||||
VerticalAlignment="Center"
|
||||
materialDesign:TextFieldAssist.HasClearButton="True"
|
||||
materialDesign:HintAssist.Hint="{Binding Hint}"
|
||||
KeyUp="{s:Action TextBoxKeyUp}"/>
|
||||
KeyDown="{s:Action TextBoxKeyDown}"/>
|
||||
</UserControl>
|
||||
+1
-1
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user