Automatically hide main settings window when sensor is repositioned.

Leapward-Koex · Nov 8, 2024 · a0cfa9c · a0cfa9c
1 parent 2033b5e
commit a0cfa9c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/MaiTouchComConnector.cs b/MaiTouchComConnector.cs
@@ -34,7 +34,7 @@ public Action<string>? OnDataRecieved
         internal set;
     }
 
-    public async Task StartTouchSensorPolling()
+    public void StartTouchSensorPolling()
     {
         if (!_connected && _shouldReconnect)
         {

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -68,8 +68,8 @@ public MainWindow()
             _touchPanel = new TouchPanel();
             _touchPanel.onTouch = (value) => { buttonState.PressButton(value); };
             _touchPanel.onRelease = (value) => { buttonState.ReleaseButton(value); };
+            _touchPanel.onInitialReposition = () => { WindowState = WindowState.Minimized; };
             _touchPanel.Show();
-            _touchPanel.Owner = this;
 
             var dataContext = (MainWindowViewModel)DataContext;
             _touchPanel.DataContext = dataContext;
@@ -90,12 +90,10 @@ private async void MainWindow_Closing(object? sender, System.ComponentModel.Canc
     {
         e.Cancel = true;
         await connector.Disconnect();
-        foreach (Window childWindow in OwnedWindows)
-        {
-            childWindow.Close();
-        }
+        _touchPanel.Close();
         Closing -= MainWindow_Closing;
         e.Cancel = false;
+        Application.Current.Shutdown();
     }
 
     private async void ExitWithSinmaiLoop()
@@ -168,16 +166,16 @@ private async void AutomaticPortConnectingLoop()
         {
             if (dataContext.IsAutomaticPortConnectingEnabled)
             {
-                await connector.StartTouchSensorPolling();
+                connector.StartTouchSensorPolling();
             }
             await Task.Delay(1000);
         }
     }
 
 
-    private async void ConnectToPortButton_Click(object sender, RoutedEventArgs e)
+    private void ConnectToPortButton_Click(object sender, RoutedEventArgs e)
     {
-        await connector.StartTouchSensorPolling();
+        connector.StartTouchSensorPolling();
     }
 
     private void debugMode_Click(object sender, RoutedEventArgs e)

diff --git a/TouchPanel.xaml.cs b/TouchPanel.xaml.cs
@@ -12,12 +12,14 @@ public partial class TouchPanel : Window
 {
     internal Action<TouchValue>? onTouch;
     internal Action<TouchValue>? onRelease;
+    internal Action? onInitialReposition;
 
     private readonly Dictionary<int, Polygon> activeTouches = [];
     private readonly TouchPanelPositionManager _positionManager;
     private List<Polygon> buttons = [];
     private bool isDebugEnabled = Properties.Settings.Default.IsDebugEnabled;
     private bool isRingButtonEmulationEnabled = Properties.Settings.Default.IsRingButtonEmulationEnabled;
+    private bool hasRepositioned = false;
 
     private enum ResizeDirection
     {
@@ -75,6 +77,12 @@ public void PositionTouchPanel()
             Left = position.Value.Left;
             Width = position.Value.Width;
             Height = position.Value.Height;
+
+            if (!hasRepositioned)
+            {
+                hasRepositioned = true;
+                onInitialReposition?.Invoke();
+            }
         }
     }