clean up desktop samples

WildernessLabs · Apr 25, 2024 · dd25a27 · dd25a27
1 parent f646794
commit dd25a27
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 61 deletions.
diff --git a/Source/Meadow.Desktop/HMI_Views/MeadowApp.cs b/Source/Meadow.Desktop/HMI_Views/MeadowApp.cs
@@ -47,6 +47,11 @@ public override Task Run()
 
     private void ExecutePlatformDisplayRunner()
     {
-        (Device.Display as SilkDisplay).Run();
+        if (Device.Display is SilkDisplay sd)
+        {
+            sd.Run();
+        }
+        MeadowOS.TerminateRun();
+        System.Environment.Exit(0);
     }
 }
diff --git a/Source/Meadow.Desktop/HMI_Views/Program.cs b/Source/Meadow.Desktop/HMI_Views/Program.cs
@@ -7,11 +7,6 @@ public class Program
 {
     public static async Task Main(string[] args)
     {
-#if WINDOWS
-        System.Windows.Forms.Application.EnableVisualStyles();
-        System.Windows.Forms.Application.SetCompatibleTextRenderingDefault(false);
-        ApplicationConfiguration.Initialize();
-#endif
         await MeadowOS.Start(args);
     }
 }
diff --git a/Source/Meadow.Desktop/PixelDisplay/MeadowAppDesktop.cs b/Source/Meadow.Desktop/PixelDisplay/MeadowAppDesktop.cs
@@ -44,21 +44,16 @@ public override Task Run()
 
     public override Task OnShutdown()
     {
-#if WINDOWS
-        System.Windows.Forms.Application.Exit();
-#endif     
         return Task.CompletedTask;
     }
 
     private void ExecutePlatformDisplayRunner()
     {
-        (Device.Display as SilkDisplay).Run();
-#if WINDOWS
-        System.Windows.Forms.Application.Run(Device.Display as System.Windows.Forms.Form);
-#endif
-        //        if (Device.Display is GtkDisplay gtk)
-        //        {
-        //            gtk.Run();
-        //        }
+        if (Device.Display is SilkDisplay sd)
+        {
+            sd.Run();
+        }
+        MeadowOS.TerminateRun();
+        System.Environment.Exit(0);
     }
 }
diff --git a/Source/Meadow.Desktop/PixelDisplay/Program.cs b/Source/Meadow.Desktop/PixelDisplay/Program.cs
@@ -5,11 +5,6 @@ public class Program
 {
     public static async Task Main(string[] args)
     {
-#if WINDOWS
-//        System.Windows.Forms.Application.EnableVisualStyles();
-//        System.Windows.Forms.Application.SetCompatibleTextRenderingDefault(false);
-//        ApplicationConfiguration.Initialize();
-#endif
         await MeadowOS.Start(args);
     }
 }
diff --git a/Source/Meadow.Desktop/Touchscreen_Demo/CircleDemo.cs b/Source/Meadow.Desktop/Touchscreen_Demo/CircleDemo.cs
@@ -24,6 +24,7 @@ public CircleDemo(DisplayScreen display, ITouchScreen touchscreen)
     {
         _touchscreen = touchscreen;
         _display = display;
+        _display.BackgroundColor = Color.White;
     }
 
     public void Start()
@@ -60,6 +61,7 @@ private void Touchscreen_TouchUp(ITouchScreen sender, TouchPoint point)
     {
         _inflateTimer?.Change(-1, -1);
         _currentCircle = null;
+        _display.Invalidate();
     }
 
     private Color GetRandomColor()

diff --git a/Source/Meadow.Desktop/Touchscreen_Demo/DisplayController.cs b/Source/Meadow.Desktop/Touchscreen_Demo/DisplayController.cs
diff --git a/Source/Meadow.Desktop/Touchscreen_Demo/MeadowApp.cs b/Source/Meadow.Desktop/Touchscreen_Demo/MeadowApp.cs
@@ -15,7 +15,7 @@ public override Task Initialize()
         var touchscreen = Device.Display as ITouchScreen;
         var display = new DisplayScreen(
                     Device.Display,
-                    touchScreen: touchscreen);
+                   touchScreen: touchscreen);
 
         _demo = new CircleDemo(display, touchscreen);
 
@@ -34,6 +34,11 @@ public override Task Run()
 
     private void ExecutePlatformDisplayRunner()
     {
-        (Device.Display as SilkDisplay).Run();
+        if (Device.Display is SilkDisplay sd)
+        {
+            sd.Run();
+        }
+        MeadowOS.TerminateRun();
+        System.Environment.Exit(0);
     }
 }
diff --git a/Source/Meadow.Desktop/Touchscreen_Demo/Program.cs b/Source/Meadow.Desktop/Touchscreen_Demo/Program.cs
@@ -7,11 +7,6 @@ public class Program
 {
     public static async Task Main(string[] args)
     {
-#if WINDOWS
-        System.Windows.Forms.Application.EnableVisualStyles();
-        System.Windows.Forms.Application.SetCompatibleTextRenderingDefault(false);
-        ApplicationConfiguration.Initialize();
-#endif
         await MeadowOS.Start(args);
     }
 }