Skip to content

Commit 02187be

Browse files
committed
SelectedRegionBrush is automatically set from the SelectedRegion
1 parent df32396 commit 02187be

3 files changed

Lines changed: 11 additions & 3 deletions

File tree

MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
</Style>
101101
</ToggleButton.Style>
102102
</ToggleButton>
103-
<ComboBox ItemsSource="{Binding ElementName=EmulatedDeviceCB, Path=SelectedItem.EmulatedKeys}" SelectedValue="{Binding SelectedRegionBrush.SelectedEmulatedKey}" VerticalAlignment="Center" MinWidth="90" MaxWidth="130" Margin="2 0" ToolTip="Choose an emulated key" Visibility="{Binding SelectedRegionBrush.UseKey, Converter={StaticResource BooleanToVisibilityConverter}}">
103+
<ComboBox ItemsSource="{Binding ElementName=EmulatedDeviceCB, Path=SelectedItem.EmulatedKeys}" SelectedValue="{Binding SelectedRegionBrush.SelectedEmulatedKey, Delay=1}" VerticalAlignment="Center" MinWidth="90" MaxWidth="130" Margin="2 0" ToolTip="Choose an emulated key" Visibility="{Binding SelectedRegionBrush.UseKey, Converter={StaticResource BooleanToVisibilityConverter}}">
104104
<ComboBox.ItemTemplate>
105105
<DataTemplate>
106106
<TextBlock VerticalAlignment="Center" Text="{Binding Name}" />

ViewModels/DynamicInputPackViewModel.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,14 @@ public InputRegion SelectedRegion
102102
set
103103
{
104104
_selected_region = value;
105+
if (SelectedRegion != null)
106+
{
107+
SelectedRegionBrush.SelectedEmulatedDevice = SelectedRegion.Device;
108+
SelectedRegionBrush.UseKey = SelectedRegion.Key == null || SelectedRegion.Key.Name != "";
109+
SelectedRegionBrush.UseTag = SelectedRegion.Tag == null || SelectedRegion.Tag.Name != "";
110+
SelectedRegionBrush.SelectedEmulatedKey = SelectedRegionBrush.UseKey ? SelectedRegion.Key : EmulatedDevices.Selected.EmulatedKeys.Count > 0 ? EmulatedDevices.Selected.EmulatedKeys[0] : null;
111+
SelectedRegionBrush.SelectedTag = SelectedRegionBrush.UseTag ? SelectedRegion.Tag : Tags.Count > 0 ? Tags[0] : null;
112+
}
105113
OnPropertyChanged(nameof(SelectedRegion));
106114
OnPropertyChanged(nameof(IfCopyTypeOverwrite));
107115
OnPropertyChanged(nameof(IsRegionSelected));

ViewModels/RegionBrush.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ public EmulatedDevice SelectedEmulatedDevice
1616
set
1717
{
1818
_selected_emulated_device = value;
19-
OnPropertyChanged(nameof(SelectedEmulatedDevice));
2019

2120
if (value?.EmulatedKeys.Count > 0)
22-
SelectedEmulatedKey ??= value.EmulatedKeys[0];
21+
SelectedEmulatedKey = value.EmulatedKeys[0];
22+
OnPropertyChanged(nameof(SelectedEmulatedDevice));
2323
}
2424
}
2525
private EmulatedDevice _selected_emulated_device;

0 commit comments

Comments
 (0)