Fix Mouse issues

csutorasa · Nov 10, 2019 · 799123a · 799123a
1 parent 8041493
commit 799123a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/XOutput/UI/Windows/AutoConfigureViewModel.cs b/XOutput/UI/Windows/AutoConfigureViewModel.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows.Threading;
 using XOutput.Devices;
 using XOutput.Devices.Input;
+using XOutput.Devices.Input.Mouse;
 using XOutput.Devices.Mapper;
 using XOutput.Devices.XInput;
 using XOutput.Tools;
@@ -24,6 +26,7 @@ public class AutoConfigureViewModel : ViewModelBase<AutoConfigureModel>
         private XInputTypes xInputType;
         private readonly InputSource[] inputTypes;
         private DateTime lastTime;
+        public Func<bool> IsMouseOverButtons { get; set; }
 
         public AutoConfigureViewModel(AutoConfigureModel model, IEnumerable<IInputDevice> inputDevices, InputMapper mapper, XInputTypes[] valuesToRead) : base(model)
         {
@@ -79,6 +82,10 @@ protected void ReadReferenceValues()
         /// </summary>
         private void ReadValues(object sender, DeviceInputChangedEventArgs e)
         {
+            if(e.Device is Mouse && (IsMouseOverButtons?.Invoke() ?? false))
+            {
+                return;
+            }
             var inputDevice = e.Device;
             InputSource maxType = null;
             double maxDiff = 0;

diff --git a/XOutput/UI/Windows/AutoConfigureWindow.xaml b/XOutput/UI/Windows/AutoConfigureWindow.xaml
@@ -62,10 +62,10 @@
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
-            <Button Margin="5 0" Padding="10" Grid.Row="3" Grid.Column="1" Click="DisableClick"
+            <Button Margin="5 0" Padding="10" Grid.Row="3" Grid.Column="1" Click="DisableClick" Name="DisableButton"
                 Content="{Binding LanguageModel.Data, Converter={StaticResource LanguageConverter}, ConverterParameter='Disable'}"/>
-            <Button Margin="5 0" Padding="10" Grid.Row="3" Grid.Column="2" Click="SaveClick"
-                IsEnabled="{Binding Model.MaxType, Converter={StaticResource NotNullToBoolConverter}}" 
+            <Button Margin="5 0" Padding="10" Grid.Row="3" Grid.Column="2" Click="SaveClick" Name="SaveButton"
+                IsEnabled="{Binding Model.MaxType, Converter={StaticResource NotNullToBoolConverter}}"
                 Content="{Binding LanguageModel.Data, Converter={StaticResource LanguageConverter}, ConverterParameter='Save'}"/>
             <Button Margin="5 0" Padding="10" Grid.Row="3" Grid.Column="3" Click="CancelClick"
                 Content="{Binding LanguageModel.Data, Converter={StaticResource LanguageConverter}, ConverterParameter='Cancel'}" />

diff --git a/XOutput/UI/Windows/AutoConfigureWindow.xaml.cs b/XOutput/UI/Windows/AutoConfigureWindow.xaml.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Input;
 using System.Windows.Threading;
 
 namespace XOutput.UI.Windows
@@ -27,6 +28,10 @@ private async void WindowLoaded(object sender, RoutedEventArgs e)
         {
             await Task.Delay(100);
             viewModel.Initialize();
+            viewModel.IsMouseOverButtons = () =>
+            {
+                return DisableButton.IsMouseOver || SaveButton.IsMouseOver;
+            };
             if (timed)
             {
                 timer.Interval = TimeSpan.FromMilliseconds(25);