system tray icon is back

davidortinau · Oct 30, 2021 · b5dba8c · b5dba8c
1 parent 4558aa5
commit b5dba8c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/src/WeatherTwentyOne/MauiProgram.cs b/src/WeatherTwentyOne/MauiProgram.cs
@@ -24,12 +24,13 @@ public static MauiApp CreateMauiApp()
                 });
             builder.ConfigureLifecycleEvents(lifecycle => {
 #if WINDOWS
-                                lifecycle
-                                    .AddWindows(windows => windows.OnLaunched((app, args) => {
-                                        MauiWinUIApplication.Current.MainWindow.SetIcon("Platforms/Windows/trayicon.ico");
-                                    }));
+                lifecycle
+                    .AddWindows(windows => windows.OnLaunched((app, args) => {
+                        var winuiApp = (Microsoft.UI.Xaml.Window)MauiWinUIApplication.Current.Application.Windows[0].Handler!.NativeView!;
+                        winuiApp.SetIcon("Platforms/Windows/trayicon.ico");
+                    }));
 #endif
-                             });
+            });
 
             var services = builder.Services;
 #if WINDOWS

diff --git a/src/WeatherTwentyOne/Platforms/Windows/TrayService.cs b/src/WeatherTwentyOne/Platforms/Windows/TrayService.cs
@@ -1,4 +1,6 @@
 using Hardcodet.Wpf.TaskbarNotification.Interop;
+using Microsoft.Maui;
+using Microsoft.UI.Xaml;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -19,7 +21,9 @@ public void Initialize()
 			tray = new WindowsTrayIcon("Platforms/Windows/trayicon.ico");
 			tray.LeftClick = () =>
 			{
-				Microsoft.Maui.MauiWinUIApplication.Current.MainWindow.BringToFront();
+                var winuiApp = (Window)MauiWinUIApplication.Current.Application.Windows[0].Handler!.NativeView!;
+                winuiApp.BringToFront();
+                //Microsoft.Maui.MauiWinUIApplication.Current.Application.Windows[0].BringToFront();
 				ClickHandler?.Invoke();
 			};
 		}

diff --git a/src/WeatherTwentyOne/Views/WidgetsPanel.xaml b/src/WeatherTwentyOne/Views/WidgetsPanel.xaml
@@ -33,7 +33,6 @@
                         </Border.StrokeShape>
                         <Grid
                             Margin="20"
-                            BackgroundColor="Red"
                             ColumnDefinitions="*"
                             RowDefinitions="*">
                             <Grid.GestureRecognizers>

diff --git a/src/WeatherTwentyOne/WeatherTwentyOne.csproj b/src/WeatherTwentyOne/WeatherTwentyOne.csproj
@@ -45,6 +45,16 @@
 		<PackageReference Include="PInvoke.User32" Version="0.7.104" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <None Remove="Platforms\Windows\trayicon.ico" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <Content Include="Platforms\Windows\trayicon.ico">
+	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	  </Content>
+	</ItemGroup>
+
 	<PropertyGroup Condition="$(TargetFramework.Contains('-windows'))">
 		<OutputType>WinExe</OutputType>
 		<RuntimeIdentifier>win-x64</RuntimeIdentifier>