The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2025-02-18 08:56:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure RecordBox can have focus. Allow extra keys to be usable while recording a macro.

Browse Source
This commit is contained in:
ryochan7@protonmail.com 2019-12-30 01:18:19 -06:00
parent 1ce2f50cba
commit e39cccf279
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DS4Windows/DS4Forms/RecordBox.xaml
View File

@ -10,7 +10,7 @@
lex:ResxLocalizationProvider.DefaultDictionary="Strings" lex:ResxLocalizationProvider.DefaultDictionary="Strings"
xmlns:local="clr-namespace:DS4WinWPF.DS4Forms" xmlns:local="clr-namespace:DS4WinWPF.DS4Forms"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="350" d:DesignWidth="800" KeyDown="UserControl_KeyDown" KeyUp="UserControl_KeyUp" MouseDown="UserControl_MouseDown" MouseUp="UserControl_MouseUp" > d:DesignHeight="350" d:DesignWidth="800" KeyDown="UserControl_KeyDown" KeyUp="UserControl_KeyUp" MouseDown="UserControl_MouseDown" MouseUp="UserControl_MouseUp" Focusable="True" >
<UserControl.Resources> <UserControl.Resources>
<DataTemplate x:Key="DisplayTemplate"> <DataTemplate x:Key="DisplayTemplate">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">

22
DS4Windows/DS4Forms/RecordBox.xaml.cs
View File

@ -62,6 +62,23 @@ namespace DS4WinWPF.DS4Forms
private void SetupLateEvents() private void SetupLateEvents()
{ {
macroListBox.SelectionChanged += MacroListBox_SelectionChanged; macroListBox.SelectionChanged += MacroListBox_SelectionChanged;
recordBoxVM.MacroSteps.CollectionChanged += MacroSteps_CollectionChanged;
}
private void MacroSteps_CollectionChanged(object sender,
System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
{
if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add)
{
Dispatcher.BeginInvoke((Action)(() =>
{
int count = recordBoxVM.MacroSteps.Count;
if (count > 0)
{
macroListBox.ScrollIntoView(recordBoxVM.MacroSteps[count - 1]);
}
}));
}
} }
private void MacroListBox_SelectionChanged(object sender, SelectionChangedEventArgs e) private void MacroListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
@ -271,12 +288,14 @@ namespace DS4WinWPF.DS4Forms
recordBoxVM.KeysdownMap.Add(value, true); recordBoxVM.KeysdownMap.Add(value, true);
} }
e.Handled = true;
//Console.WriteLine(e.Key); //Console.WriteLine(e.Key);
//Console.WriteLine(e.SystemKey); //Console.WriteLine(e.SystemKey);
} }
else if (e.Key == Key.Delete && recordBoxVM.MacroStepIndex >= 0) else if (e.Key == Key.Delete && recordBoxVM.MacroStepIndex >= 0)
{ {
recordBoxVM.MacroSteps.RemoveAt(recordBoxVM.MacroStepIndex); recordBoxVM.MacroSteps.RemoveAt(recordBoxVM.MacroStepIndex);
e.Handled = true;
} }
} }
@ -294,6 +313,7 @@ namespace DS4WinWPF.DS4Forms
recordBoxVM.KeysdownMap.Remove(value); recordBoxVM.KeysdownMap.Remove(value);
} }
e.Handled = true;
//Console.WriteLine(e.Key); //Console.WriteLine(e.Key);
//Console.WriteLine(e.SystemKey); //Console.WriteLine(e.SystemKey);
} }
@ -499,6 +519,7 @@ namespace DS4WinWPF.DS4Forms
DS4Windows.MacroStep.StepType.ActDown, DS4Windows.MacroStep.StepOutput.Button); DS4Windows.MacroStep.StepType.ActDown, DS4Windows.MacroStep.StepOutput.Button);
recordBoxVM.AddMacroStep(step); recordBoxVM.AddMacroStep(step);
recordBoxVM.KeysdownMap.Add(value, true); recordBoxVM.KeysdownMap.Add(value, true);
e.Handled = true;
} }
} }
@ -521,6 +542,7 @@ namespace DS4WinWPF.DS4Forms
DS4Windows.MacroStep.StepType.ActUp, DS4Windows.MacroStep.StepOutput.Button); DS4Windows.MacroStep.StepType.ActUp, DS4Windows.MacroStep.StepOutput.Button);
recordBoxVM.AddMacroStep(step); recordBoxVM.AddMacroStep(step);
recordBoxVM.KeysdownMap.Remove(value); recordBoxVM.KeysdownMap.Remove(value);
e.Handled = true;
} }
} }
} }