Touchscreen toggle toast tweaks #3143

seerge · Sep 23, 2024 · c6d1b29 · c6d1b29
1 parent 79cd773
commit c6d1b29
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/app/Helpers/TouchscreenHelper.cs b/app/Helpers/TouchscreenHelper.cs
@@ -2,21 +2,31 @@
 
 public static class TouchscreenHelper
 {
-    public static bool? ToggleTouchscreen()
+
+    public static bool? GetStatus()
     {
         try
         {
             ProcessHelper.RunAsAdmin();
+            return ProcessHelper.RunCMD("powershell", "(Get-PnpDevice -FriendlyName '*touch*screen*').Status").Contains("OK");
+        }
+        catch (Exception ex)
+        {
+            Logger.WriteLine($"Can't get touchscreen status: {ex.Message}");
+            return null;
+        }
+    }
 
-            var status = !ProcessHelper.RunCMD("powershell", "(Get-PnpDevice -FriendlyName '*touch*screen*').Status").Contains("OK");
+    public static void ToggleTouchscreen(bool status)
+    {
+        try
+        {
+            ProcessHelper.RunAsAdmin();
             ProcessHelper.RunCMD("powershell", (status ? "Enable-PnpDevice" : "Disable-PnpDevice") + " -InstanceId (Get-PnpDevice -FriendlyName '*touch*screen*').InstanceId -Confirm:$false");
-
-            return status;
         }
         catch (Exception ex)
         {
             Logger.WriteLine($"Can't toggle touchscreen: {ex.Message}");
-            return null;
         }
 
     }

diff --git a/app/Input/InputDispatcher.cs b/app/Input/InputDispatcher.cs
@@ -591,9 +591,13 @@ public static void KeyProcess(string name = "m3")
                     Program.settingsForm.BeginInvoke(Program.settingsForm.allyControl.ToggleModeHotkey);
                     break;
                 case "touchscreen":
-                    var touchscreenStatus = TouchscreenHelper.ToggleTouchscreen();
-                    if (touchscreenStatus is not null)
-                        Program.toast.RunToast(Properties.Strings.Touchscreen + " " + ((bool)touchscreenStatus ? Properties.Strings.On : Properties.Strings.Off), ToastIcon.Touchpad);
+                    var status = !TouchscreenHelper.GetStatus();
+                    Logger.WriteLine("Touchscreen status: " + status);
+                    if (status is not null)
+                    {
+                        Program.toast.RunToast(Properties.Strings.Touchscreen + " " + ((bool)status ? Properties.Strings.On : Properties.Strings.Off), ToastIcon.Touchpad);
+                        TouchscreenHelper.ToggleTouchscreen((bool)status);
+                    }
                     break;
                 default:
                     break;