AntiDeadzone slider for Quicktools and improve range (#243)

Valkirie · Sep 16, 2022 · 785c59e · 785c59e
1 parent af5956f
commit 785c59e
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 2 deletions.
diff --git a/HandheldCompanion/Views/Pages/ProfilesPage.xaml b/HandheldCompanion/Views/Pages/ProfilesPage.xaml
@@ -449,7 +449,7 @@
 
                                     <DockPanel Grid.Column="1" Margin="12,0,0,0" ScrollViewer.PanningMode="HorizontalOnly">
                                         <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding Value, ElementName=tb_ProfileAntiDeadzone, Mode=OneWay}" />
-                                        <Slider Margin="6,0,0,0" Name="tb_ProfileAntiDeadzone" VerticalAlignment="Center" AutoToolTipPlacement="TopLeft" LargeChange="10" Maximum="100" TickPlacement="BottomRight" SmallChange="1" TickFrequency="1" IsSnapToTickEnabled="True" IsMoveToPointEnabled="True" />
+                                        <Slider Margin="6,0,0,0" Name="tb_ProfileAntiDeadzone" VerticalAlignment="Center" AutoToolTipPlacement="TopLeft" LargeChange="10" Maximum="40" TickPlacement="BottomRight" SmallChange="1" TickFrequency="1" IsSnapToTickEnabled="True" IsMoveToPointEnabled="True" />
                                     </DockPanel>
                                 </Grid>
 

diff --git a/HandheldCompanion/Views/QuickPages/QuickProfilesPage.xaml b/HandheldCompanion/Views/QuickPages/QuickProfilesPage.xaml
@@ -170,6 +170,30 @@
                             </DockPanel>
                         </ui:SimpleStackPanel>
 
+                        <ui:SimpleStackPanel Spacing="10" Name="GridAntiDeadzone">
+                            <!-- Separator -->
+                            <Separator BorderBrush="{DynamicResource SystemControlBackgroundChromeMediumBrush}" BorderThickness="0 1 0 0" />
+
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition MinWidth="420"></ColumnDefinition>
+                                    <ColumnDefinition></ColumnDefinition>
+                                </Grid.ColumnDefinitions>
+
+                                <StackPanel Orientation="Vertical">
+                                    <TextBlock Text="{x:Static resx:Resources.ProfilesPage_AntiDeadzone}" FontSize="14"/>
+                                    <TextBlock Text="{x:Static resx:Resources.ProfilesPage_AntiDeadzoneDesc}" Foreground="{DynamicResource SystemControlForegroundBaseMediumBrush}" FontSize="12" TextWrapping="Wrap"/>
+                                </StackPanel>
+                            </Grid>
+
+                            <!-- Content -->
+                            <DockPanel Grid.Column="1" Margin="0,0,0,0" ScrollViewer.PanningMode="HorizontalOnly">
+                                <TextBlock Width="30" TextAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Left" Text="{Binding Value, StringFormat=N0, ElementName=SliderAntiDeadzone, Mode=OneWay}" />
+                                <Slider Name="SliderAntiDeadzone" Margin="8,0,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Center" AutoToolTipPlacement="TopLeft" LargeChange="5" Maximum="40" Minimum="1" Value="1" TickPlacement="BottomRight" SmallChange="1" AutoToolTipPrecision="0" IsSnapToTickEnabled="True" IsMoveToPointEnabled="True"
+								ValueChanged="SliderAntiDeadzone_ValueChanged" />
+                            </DockPanel>
+                        </ui:SimpleStackPanel>
+
                     </ui:SimpleStackPanel>
                 </Border>
             </Grid>

diff --git a/HandheldCompanion/Views/QuickPages/QuickProfilesPage.xaml.cs b/HandheldCompanion/Views/QuickPages/QuickProfilesPage.xaml.cs
@@ -144,8 +144,9 @@ private void ProfileUpdated(Profile profile, bool backgroundtask, bool isCurrent
 
                 TDPToggle.IsOn = profile.TDP_override;
 
-                // Sensivity settings
+                // Slider settings
                 SliderSensivity.Value = profile.aiming_sensivity;
+                SliderAntiDeadzone.Value = profile.antideadzone;
 
                 if (backgroundtask)
                     return;
@@ -228,10 +229,12 @@ private void cB_Input_SelectionChanged(object sender, SelectionChangedEventArgs
                 case Input.JoystickCamera:
                     cB_Output.SelectedIndex = (int)Output.RightStick;
                     GridSensivity.Visibility = Visibility.Visible;
+                    GridAntiDeadzone.Visibility = Visibility.Visible;
                     break;
                 case Input.JoystickSteering:
                     cB_Output.SelectedIndex = (int)Output.LeftStick;
                     GridSensivity.Visibility = Visibility.Collapsed;
+                    GridAntiDeadzone.Visibility = Visibility.Collapsed;
                     break;
             }
 
@@ -326,5 +329,18 @@ private void SliderSensivity_ValueChanged(object sender, RoutedPropertyChangedEv
             currentProfile.aiming_sensivity = (float)SliderSensivity.Value;
             UpdateProfile();
         }
+
+        private void SliderAntiDeadzone_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+            if (currentProfile is null)
+                return;
+
+            if (!IsReady)
+                return;
+
+            // Antideadzone settings
+            currentProfile.antideadzone = (float)SliderAntiDeadzone.Value;
+            UpdateProfile();
+        }
     }
 }