Fix tracers dropdown, replace noticebar functions to just call the main function instead, removed the background on the display selector and color wheel, fix seperation issue on color wheel, increased text size for the selected display

Author: whoswhip

Aimmy2/App.xaml.cs

@@ -1,13 +1,10 @@
-using Aimmy2.Class;
-using Aimmy2.Theme;
+using Aimmy2.Theme;
 using Class;
-using System;
-using System.Collections.Generic;
 using System.Windows;
 
 namespace Aimmy2
 {
-    public partial class App : System.Windows.Application
+    public partial class App : Application
     {
         protected override void OnStartup(StartupEventArgs e)
         {
@@ -17,6 +14,13 @@ protected override void OnStartup(StartupEventArgs e)
             // Set shutdown mode to prevent app from closing when startup window closes
             ShutdownMode = ShutdownMode.OnExplicitShutdown;
 
+#if DEBUG
+            var _mainWindow = new MainWindow();
+            MainWindow = _mainWindow;
+            _mainWindow.Show();
+            return;
+#endif
+            // code IS reachable, only in release though
             try
             {
                 // Create and show startup window

Aimmy2/UILibrary/AColorWheel.xaml

@@ -191,12 +191,6 @@
                         Height="50"
                         VerticalAlignment="Bottom"
                         CornerRadius="0">
-                    <Border.Background>
-                        <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
-                            <GradientStop Color="#FF1A1A1A" Offset="0"/>
-                            <GradientStop Color="#FF0F0F0F" Offset="1"/>
-                        </LinearGradientBrush>
-                    </Border.Background>
 
                     <Grid>
                         <Grid.ColumnDefinitions>

Aimmy2/UILibrary/ADisplaySelector.xaml

@@ -43,18 +43,12 @@
                 <Border Height="50"
                         VerticalAlignment="Bottom"
                         CornerRadius="0">
-                    <Border.Background>
-                        <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
-                            <GradientStop Color="#FF1A1A1A" Offset="0"/>
-                            <GradientStop Color="#FF0F0F0F" Offset="1"/>
-                        </LinearGradientBrush>
-                    </Border.Background>
 
                     <Label x:Name="CurrentDisplayInfo"
                            FontFamily="{StaticResource Atkinson Hyperlegible}"
                            Content="Primary Display Selected"
                            Foreground="#BBFFFFFF"
-                           FontSize="11"
+                           FontSize="14"
                            HorizontalContentAlignment="Center"
                            VerticalContentAlignment="Center"/>
                 </Border>

Aimmy2/UISections/AimMenuControl.xaml.cs

@@ -253,9 +253,9 @@ private void AddConfigSliders(SectionBuilder builder, UI uiManager)
                     {
                         var value = s.Slider.Value;
                         if (value >= 0.98)
-                            ShowNotice("The Mouse Sensitivity you have set can cause Aimmy to be unable to aim, please decrease if you suffer from this problem");
+                            new NoticeBar("The Mouse Sensitivity you have set can cause Aimmy to be unable to aim, please decrease if you suffer from this problem").Show();
                         else if (value <= 0.1)
-                            ShowNotice("The Mouse Sensitivity you have set can cause Aimmy to be unstable to aim, please increase if you suffer from this problem");
+                            new NoticeBar("The Mouse Sensitivity you have set can cause Aimmy to be unstable to aim, please increase if you suffer from this problem").Show();
                     };
                 })
                 .AddSlider("Mouse Jitter", "Jitter", 1, 1, 0, 15, s => uiManager.S_MouseJitter = s)
@@ -344,7 +344,7 @@ private void LoadAntiRecoilConfig()
                         if (saveFileDialog.ShowDialog() == true)
                         {
                             SaveDictionary.WriteJSON(Dictionary.AntiRecoilSettings, saveFileDialog.FileName);
-                            ShowNotice($"[Anti Recoil] Config has been saved to \"{saveFileDialog.FileName}\"", 2000);
+                            new NoticeBar($"[Anti Recoil] Config has been saved to \"{saveFileDialog.FileName}\"", 2000).Show();
                         }
                     };
                 })
@@ -422,7 +422,7 @@ private void LoadESPConfig()
 
             builder.AddDropdown("Tracer Position", d =>
             {
-                d.DropdownBox.SelectedIndex = -1;
+                d.DropdownBox.SelectedIndex = 0;
                 uiManager.D_TracerPosition = d;
                 _mainWindow.AddDropdownItem(d, "Bottom");
                 _mainWindow.AddDropdownItem(d, "Middle");
@@ -491,9 +491,6 @@ private void HandleColorChange(AColorChanger colorChanger, string settingKey, Ac
             }
         }
 
-        private void ShowNotice(string message, int duration = 10000) =>
-            new NoticeBar(message, duration).Show();
-
         public void Dispose()
         {
             // Save minimize states before disposing

Aimmy2/UISections/SettingsMenuControl.xaml.cs

@@ -186,9 +186,9 @@ private void LoadSettingsConfig()
                     {
                         var value = s.Slider.Value;
                         if (value >= 95)
-                            ShowNotice("The minimum confidence you have set for Aimmy to be too high and may be unable to detect players.");
+                            new NoticeBar("The minimum confidence you have set for Aimmy to be too high and may be unable to detect players.").Show();
                         else if (value <= 35)
-                            ShowNotice("The minimum confidence you have set for Aimmy may be too low can cause false positives.");
+                            new NoticeBar("The minimum confidence you have set for Aimmy may be too low can cause false positives.").Show();
                     };
                 })
                 .AddToggle("Mouse Background Effect", t => uiManager.T_MouseBackgroundEffect = t)
@@ -248,11 +248,11 @@ private void LoadDisplaySelectMenu()
                 {
                     DisplayManager.RefreshDisplays();
                     uiManager.DisplaySelector.RefreshDisplays();
-                    ShowNotice("Display list refreshed successfully");
+                    new NoticeBar("Display list refreshed successfully").Show();
                 }
                 catch (Exception ex)
                 {
-                    ShowNotice($"Error refreshing displays: {ex.Message}");
+                    new NoticeBar($"Error refreshing displays: {ex.Message}").Show();
                 }
             };
             DisplaySelectMenu.Children.Insert(insertIndex + 1, refreshButton);
@@ -276,7 +276,7 @@ private void LoadThemeMenu()
             uiManager.ThemeColorWheel = new AColorWheel();
 
             // Insert before separator
-            var insertIndex = ThemeMenu.Children.Count - 1;
+            var insertIndex = ThemeMenu.Children.Count - 2;
             ThemeMenu.Children.Insert(insertIndex, uiManager.ThemeColorWheel);
         }
 
@@ -290,7 +290,7 @@ private void OnDisplayChanged(object? sender, DisplayChangedEventArgs e)
             {
                 try
                 {
-                    ShowNotice($"AI focus switched to Display {e.DisplayIndex + 1} ({e.Bounds.Width}x{e.Bounds.Height})");
+                    new NoticeBar($"AI focus switched to Display {e.DisplayIndex + 1} ({e.Bounds.Width}x{e.Bounds.Height})").Show();
                     UpdateDisplayRelatedSettings(e);
                 }
                 catch (Exception ex)
@@ -310,9 +310,6 @@ private async Task ResetToMouseEvent()
             _mainWindow!.uiManager.D_MouseMovementMethod!.DropdownBox.SelectedIndex = 0;
         }
 
-        private void ShowNotice(string message, int duration = 4000) =>
-            new NoticeBar(message, duration).Show();
-
         public void Dispose()
         {
             DisplayManager.DisplayChanged -= OnDisplayChanged;