Improve virtual trackpads (#597)

* improve the way we handle virtual trackpads opacity

- add small vibration when virtual trackpads are touched (make this a setting ?)

* use Rumble()

* add touchleave on trackpads

Should fix the opacity issue.

* add Duration setting on Rumble

ControllerCommon/Controllers/IController.cs

@@ -259,7 +259,7 @@ public virtual bool IsConnected()
             return false;
         }
 
-        public virtual void Rumble(int loop)
+        public virtual void Rumble(int Loop = 1, byte LeftValue = byte.MaxValue, byte RightValue = byte.MaxValue, byte Duration = 125)
         { }
 
         public virtual bool IsPlugged()

HandheldCompanion/App.config

@@ -107,7 +107,7 @@
                 <value>0</value>
             </setting>
             <setting name="OverlayControllerOpacity" serializeAs="String">
-                <value>1</value>
+                <value>0.25</value>
             </setting>
             <setting name="OverlayControllerBackgroundColor" serializeAs="String">
                 <value>#00000000</value>

HandheldCompanion/Controllers/NeptuneController.cs

@@ -290,22 +290,20 @@ public virtual bool IsVirtualMuted()
             return isVirtualMuted;
         }
 
-        public override void Rumble(int loop)
+        public override void Rumble(int Loop = 1, byte LeftValue = byte.MaxValue, byte RightValue = byte.MaxValue, byte Duration = 125)
         {
             Task.Factory.StartNew(async () =>
             {
-                for (int i = 0; i < loop * 2; i++)
+                for (int i = 0; i < Loop * 2; i++)
                 {
                     if (i % 2 == 0)
-                        SetVibration(byte.MaxValue, byte.MaxValue);
+                        SetVibration(LeftValue, RightValue);
                     else
                         SetVibration(0, 0);
 
-                    await Task.Delay(125);
+                    await Task.Delay(Duration);
                 }
             });
-
-            base.Rumble(loop);
         }
 
         public override void Plug()

HandheldCompanion/Controllers/XInputController.cs

@@ -283,22 +283,20 @@ public override void SetVibration(byte LargeMotor, byte SmallMotor)
             Controller.SetVibration(vibration);
         }
 
-        public override void Rumble(int loop)
+        public override void Rumble(int Loop = 1, byte LeftValue = byte.MaxValue, byte RightValue = byte.MaxValue, byte Duration = 125)
         {
             Task.Factory.StartNew(async () =>
             {
-                for (int i = 0; i < loop * 2; i++)
+                for (int i = 0; i < Loop * 2; i++)
                 {
                     if (i % 2 == 0)
-                        SetVibration(byte.MaxValue, byte.MaxValue);
+                        SetVibration(LeftValue, RightValue);
                     else
                         SetVibration(0, 0);
 
-                    await Task.Delay(125);
+                    await Task.Delay(Duration);
                 }
             });
-
-            base.Rumble(loop);
         }
 
         public override void Plug()

HandheldCompanion/Properties/Settings.settings

@@ -102,7 +102,7 @@
       <Value Profile="(Default)">0</Value>
     </Setting>
     <Setting Name="OverlayControllerOpacity" Type="System.Double" Scope="User">
-      <Value Profile="(Default)">1</Value>
+      <Value Profile="(Default)">0.25</Value>
     </Setting>
     <Setting Name="OverlayControllerBackgroundColor" Type="System.String" Scope="User">
       <Value Profile="(Default)">#00000000</Value>

HandheldCompanion/Views/Pages/OverlayPage.xaml.cs

@@ -110,19 +110,6 @@ private void UpdateUI_TrackpadsPosition(int trackpadsAlignment)
                 else
                     button.Style = Application.Current.FindResource("DefaultButtonStyle") as Style;
             }
-
-            switch (trackpadsAlignment)
-            {
-                case 0:
-                    MainWindow.overlayTrackpad.VerticalAlignment = VerticalAlignment.Top;
-                    break;
-                case 1:
-                    MainWindow.overlayTrackpad.VerticalAlignment = VerticalAlignment.Center;
-                    break;
-                case 2:
-                    MainWindow.overlayTrackpad.VerticalAlignment = VerticalAlignment.Bottom;
-                    break;
-            }
         }
 
         private void UpdateUI_ControllerPosition(int controllerAlignment)
@@ -188,11 +175,6 @@ private void SliderControllerSize_ValueChanged(object sender, RoutedPropertyChan
 
         private void SliderTrackpadsSize_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
-            MainWindow.overlayTrackpad.LeftTrackpad.Width = SliderTrackpadsSize.Value;
-            MainWindow.overlayTrackpad.RightTrackpad.Width = SliderTrackpadsSize.Value;
-            MainWindow.overlayTrackpad.Height = SliderTrackpadsSize.Value;
-            MainWindow.overlayTrackpad.HorizontalAlignment = HorizontalAlignment.Stretch;
-
             if (!IsLoaded)
                 return;
 
@@ -234,9 +216,6 @@ private void TrackpadsAlignment_Click(object sender, RoutedEventArgs e)
 
         private void SliderTrackpadsOpacity_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
-            MainWindow.overlayTrackpad.LeftTrackpad.Opacity = SliderTrackpadsOpacity.Value;
-            MainWindow.overlayTrackpad.RightTrackpad.Opacity = SliderTrackpadsOpacity.Value;
-
             if (!IsLoaded)
                 return;
 

HandheldCompanion/Views/Windows/OverlayTrackpad.xaml

@@ -2,40 +2,39 @@
     x:Class="HandheldCompanion.Views.Windows.OverlayTrackpad"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:HelixToolkit="clr-namespace:HelixToolkit.Wpf;assembly=HelixToolkit.Wpf"
     xmlns:common="clr-namespace:HandheldCompanion.Views.Classes"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:HandheldCompanion.Views.Windows"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="http://schemas.modernwpf.com/2019"
     Title="Virtual Trackpads"
-    HorizontalAlignment="Stretch"
     Closing="Window_Closing"
+    WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
 
     <Grid>
         <!--  Left Trackpad  -->
         <Border
             Name="LeftTrackpad"
             Height="{Binding ActualHeight, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type FrameworkElement}}}"
+            Margin="15,0,0,0"
             HorizontalAlignment="Left"
             Background="Black"
             CornerRadius="10"
-            Opacity="0.25"
             PreviewTouchDown="Trackpad_PreviewTouchDown"
             PreviewTouchMove="Trackpad_PreviewTouchMove"
-            PreviewTouchUp="Trackpad_PreviewTouchUp" />
+            PreviewTouchUp="Trackpad_PreviewTouchUp"
+            TouchLeave="Trackpad_PreviewTouchUp" />
 
         <!--  Right Trackpad  -->
         <Border
             Name="RightTrackpad"
             Height="{Binding ActualHeight, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type FrameworkElement}}}"
+            Margin="0,0,15,0"
             HorizontalAlignment="Right"
             Background="Black"
             CornerRadius="10"
-            Opacity="0.25"
             PreviewTouchDown="Trackpad_PreviewTouchDown"
             PreviewTouchMove="Trackpad_PreviewTouchMove"
-            PreviewTouchUp="Trackpad_PreviewTouchUp" />
+            PreviewTouchUp="Trackpad_PreviewTouchUp"
+            TouchLeave="Trackpad_PreviewTouchUp" />
     </Grid>
 </common:OverlayWindow>

HandheldCompanion/Views/Windows/OverlayTrackpad.xaml.cs

@@ -1,8 +1,12 @@
 using ControllerCommon.Pipes;
+using HandheldCompanion.Managers;
 using HandheldCompanion.Views.Classes;
+using System;
 using System.Windows;
 using System.Windows.Forms;
 using System.Windows.Input;
+using Application = System.Windows.Application;
+using HorizontalAlignment = System.Windows.HorizontalAlignment;
 
 namespace HandheldCompanion.Views.Windows
 {
@@ -21,21 +25,74 @@ private class TouchInput
         private TouchInput rightInput;
         private double dpiInput;
 
+        private double TrackpadOpacity = 0.25;
+        private double TrackpadOpacityTouched = 0.10; // extra opacity when touched
+
         public OverlayTrackpad()
         {
             InitializeComponent();
 
+            SettingsManager.SettingValueChanged += SettingsManager_SettingValueChanged;
+
             // touch vars
             dpiInput = GetWindowsScaling();
             leftInput = new TouchInput();
             rightInput = new TouchInput();
         }
 
+        private void SettingsManager_SettingValueChanged(string name, object value)
+        {
+            // UI thread (async)
+            Application.Current.Dispatcher.BeginInvoke(() =>
+            {
+                switch (name)
+                {
+                    case "OverlayTrackpadsSize":
+                        {
+                            int size = Convert.ToInt32(value);
+                            this.LeftTrackpad.Width = size;
+                            this.RightTrackpad.Width = size;
+                            this.Height = size;
+                            this.HorizontalAlignment = HorizontalAlignment.Stretch;
+                        }
+                        break;
+                    case "OverlayTrackpadsAlignment":
+                        {
+                            int trackpadsAlignment = Convert.ToInt32(value);
+                            switch (trackpadsAlignment)
+                            {
+                                case 0:
+                                    this.VerticalAlignment = VerticalAlignment.Top;
+                                    break;
+                                case 1:
+                                    this.VerticalAlignment = VerticalAlignment.Center;
+                                    break;
+                                case 2:
+                                    this.VerticalAlignment = VerticalAlignment.Bottom;
+                                    break;
+                            }
+                        }
+                        break;
+                    case "OverlayTrackpadsOpacity":
+                        {
+                            TrackpadOpacity = Convert.ToDouble(value);
+                            LeftTrackpad.Opacity = TrackpadOpacity;
+                            RightTrackpad.Opacity = TrackpadOpacity;
+                        }
+                        break;
+                }
+            });
+        }
+
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
             // do something
         }
 
+        private void UpdateUI_TrackpadsPosition(int trackpadsAlignment)
+        {
+        }
+
         public double GetWindowsScaling()
         {
             return Screen.PrimaryScreen.Bounds.Width / SystemParameters.PrimaryScreenWidth;
@@ -118,7 +175,10 @@ private void Trackpad_PreviewTouchDown(object sender, TouchEventArgs e)
 
                         Trackpad_TouchInput(e, CursorAction.CursorDown, CursorButton.TouchLeft);
 
-                        LeftTrackpad.Opacity += 0.10;
+                        LeftTrackpad.Opacity = TrackpadOpacity + TrackpadOpacityTouched;
+
+                        // send vibration (todo: make it a setting)
+                        ControllerManager.GetTargetController()?.Rumble(1, 25, 0, 60);
                     }
                     break;
                 case "RightTrackpad":
@@ -129,7 +189,10 @@ private void Trackpad_PreviewTouchDown(object sender, TouchEventArgs e)
 
                         Trackpad_TouchInput(e, CursorAction.CursorDown, CursorButton.TouchRight);
 
-                        RightTrackpad.Opacity += 0.10;
+                        RightTrackpad.Opacity = TrackpadOpacity + TrackpadOpacityTouched;
+
+                        // send vibration (todo: make it a setting)
+                        ControllerManager.GetTargetController()?.Rumble(1, 0, 25, 60);
                     }
                     break;
             }
@@ -147,14 +210,14 @@ private void Trackpad_PreviewTouchUp(object sender, TouchEventArgs e)
                     {
                         leftInput.Flags = 0;
                         Trackpad_TouchInput(e, CursorAction.CursorUp, CursorButton.TouchLeft);
-                        LeftTrackpad.Opacity -= 0.10;
+                        LeftTrackpad.Opacity = TrackpadOpacity - TrackpadOpacityTouched;
                     }
                     break;
                 case "RightTrackpad":
                     {
                         rightInput.Flags = 0;
                         Trackpad_TouchInput(e, CursorAction.CursorUp, CursorButton.TouchRight);
-                        RightTrackpad.Opacity -= 0.10;
+                        RightTrackpad.Opacity = TrackpadOpacity - TrackpadOpacityTouched;
                     }
                     break;
             }