From fdfadea7feacdf7ef2f2c2b088775b7dca0a8a02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=AD=20Climent?= <marticlilop@gmail.com>
Date: Sun, 19 May 2024 14:44:50 +0200
Subject: [PATCH] Minor improvements

---
 src/UniGetUI/Interface/MainWindow.xaml.cs        | 16 +++++++++++-----
 .../SoftwarePages/AbstractPackagesPage.xaml      |  4 ++--
 .../Interface/SoftwarePages/PackageBundle.xaml   |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/UniGetUI/Interface/MainWindow.xaml.cs b/src/UniGetUI/Interface/MainWindow.xaml.cs
index 6c26c492a..7a491ca9b 100644
--- a/src/UniGetUI/Interface/MainWindow.xaml.cs
+++ b/src/UniGetUI/Interface/MainWindow.xaml.cs
@@ -39,7 +39,7 @@ IntPtr GetForWindow([System.Runtime.InteropServices.In] IntPtr appWindow,
             void ShowShareUIForWindow(IntPtr appWindow);
         }
 
-        TaskbarIcon TrayIcon;
+        TaskbarIcon? TrayIcon;
         private bool RecentlyActivated = false;
 
         static readonly Guid _dtm_iid =
@@ -55,6 +55,7 @@ IntPtr GetForWindow([System.Runtime.InteropServices.In] IntPtr appWindow,
         public List<ContentDialog> DialogQueue = new();
 
         public List<NavButton> NavButtonList = new();
+#pragma warning disable CS8618
         public MainWindow()
         {
             InitializeComponent();
@@ -76,7 +77,7 @@ public MainWindow()
             LoadingSthDalog.Title = CoreTools.Translate("Please wait");
             LoadingSthDalog.Content = new ProgressBar() { IsIndeterminate = true, Width = 300 };
         }
-
+#pragma warning restore CS8618
         public void HandleNotificationActivation(ToastArguments args, ValueSet input)
         {
             if (args.Contains("action") && args["action"] == "updateAll")
@@ -275,14 +276,19 @@ public void UpdateSystemTrayStatus()
                 else
                     tooltip = CoreTools.Translate("{0} updates are available").Replace("{0}", MainApp.Instance.TooltipStatus.AvailableUpdates.ToString()) + " - " + Title;
             }
+            if(TrayIcon == null)
+            {
+                Logger.Warn("Attempting to update a null taskbar icon tray, aborting!");
+                return;
+            }
 
             TrayIcon.ToolTipText = tooltip;
 
             ApplicationTheme theme = ApplicationTheme.Light;
             string RegistryKeyPath = @"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize";
             string RegistryValueName = "SystemUsesLightTheme";
-            RegistryKey key = Registry.CurrentUser.OpenSubKey(RegistryKeyPath);
-            object registryValueObject = key?.GetValue(RegistryValueName);
+            RegistryKey? key = Registry.CurrentUser.OpenSubKey(RegistryKeyPath);
+            object? registryValueObject = key?.GetValue(RegistryValueName) ?? null;
             if (registryValueObject != null)
             {
                 int registryValue = (int)registryValueObject;
@@ -294,7 +300,7 @@ public void UpdateSystemTrayStatus()
                 modifier += "_white";
 
 
-            string FullIconPath = Path.Join(Directory.GetParent(Assembly.GetEntryAssembly().Location).ToString(), "\\Assets\\Images\\tray" + modifier + ".ico");
+            string FullIconPath = Path.Join(CoreData.UniGetUIExecutableDirectory, "\\Assets\\Images\\tray" + modifier + ".ico");
 
             TrayIcon.SetValue(TaskbarIcon.IconSourceProperty, new BitmapImage() { UriSource = new Uri(FullIconPath) });
         }
diff --git a/src/UniGetUI/Interface/SoftwarePages/AbstractPackagesPage.xaml b/src/UniGetUI/Interface/SoftwarePages/AbstractPackagesPage.xaml
index 6aa942d13..4a0aff0eb 100644
--- a/src/UniGetUI/Interface/SoftwarePages/AbstractPackagesPage.xaml
+++ b/src/UniGetUI/Interface/SoftwarePages/AbstractPackagesPage.xaml
@@ -635,7 +635,7 @@
                          VerticalContentAlignment="Center"
                          />
                 <Button Grid.Column="1" x:Name="FindButton" CornerRadius="0,4,4,0" x:FieldModifier="protected"
-                        Height="32" Width="30" Padding="4" AutomationProperties.HelpText="Search">
+                        Height="32" Width="32" Padding="4" AutomationProperties.HelpText="Search">
                     <AnimatedIcon>
                         <AnimatedIcon.Source>
                             <animatedvisuals:AnimatedFindVisualSource/>
@@ -880,7 +880,7 @@
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <TextBox x:Name="MegaQueryBlock" x:FieldModifier="protected" Grid.Column="1" Grid.Row="1" 
-                         CornerRadius="12,0,0,12" FontSize="40" Padding="20,12,10,13" FontWeight="SemiBold"/>
+                         CornerRadius="12,0,0,12" FontSize="40" Padding="20,11,10,11" FontWeight="SemiBold"/>
                 <Button Grid.Column="2" Grid.Row="1" x:Name="MegaFindButton" CornerRadius="0,12,12,0" x:FieldModifier="protected"
                         Height="80" Width="80" Padding="12" AutomationProperties.HelpText="Search">
                     <AnimatedIcon>
diff --git a/src/UniGetUI/Interface/SoftwarePages/PackageBundle.xaml b/src/UniGetUI/Interface/SoftwarePages/PackageBundle.xaml
index 790f85903..b4fc80215 100644
--- a/src/UniGetUI/Interface/SoftwarePages/PackageBundle.xaml
+++ b/src/UniGetUI/Interface/SoftwarePages/PackageBundle.xaml
@@ -625,7 +625,7 @@
                          VerticalContentAlignment="Center"
                          />
                 <Button Grid.Column="1" x:Name="FindButton" CornerRadius="0,4,4,0"
-                        Height="32" Width="30" Padding="4" AutomationProperties.HelpText="Search">
+                        Height="32" Width="32" Padding="4" AutomationProperties.HelpText="Search">
                     <AnimatedIcon>
                         <AnimatedIcon.Source>
                             <animatedvisuals:AnimatedFindVisualSource/>