Merge branch 'main' into linux-speech-recognition

Author: MattEqualsCoder

src/TrackerCouncil.Smz3.Tracking/TrackingServices/TrackerTreasureService.cs

@@ -151,6 +151,7 @@ public void ClearDungeon(IHasTreasure treasureRegion, float? confidence = null)
         var remaining = treasureRegion.RemainingTreasure;
         if (remaining > 0)
         {
+            treasureRegion.HasManuallyClearedTreasure = true;
             treasureRegion.RemainingTreasure = 0;
         }
 

src/TrackerCouncil.Smz3.UI/Views/GenerationSettingsWindow.axaml

@@ -10,15 +10,18 @@
         x:Class="TrackerCouncil.Smz3.UI.Views.GenerationSettingsWindow"
         Title="SMZ3 Cas' Randomizer"
         Height="750" Width="700"
-        CanResize="False"
+        Opened="TopLevel_OnOpened"
+        CanResize="True"
         WindowStartupLocation="CenterOwner"
         Icon="/Assets/smz3.ico"
         x:DataType="viewModels:GenerationWindowViewModel">
   <LayoutTransformControl x:Name="MainLayout">
-    <Grid RowDefinitions="*, Auto">
+    <Grid RowDefinitions="*, Auto" x:Name="MainGrid">
       <TabControl Grid.Row="0" Margin="5">
         <TabItem Header="Basic">
-          <views:GenerationSettingsBasicPanel DataContext="{Binding}" x:Name="BasicPanel" Displayed="BasicPanel_OnDisplayed"></views:GenerationSettingsBasicPanel>
+          <ScrollViewer>
+            <views:GenerationSettingsBasicPanel DataContext="{Binding}" x:Name="BasicPanel" Displayed="BasicPanel_OnDisplayed" Margin="0 0 5 5"></views:GenerationSettingsBasicPanel>
+          </ScrollViewer>
         </TabItem>
         <TabItem Header="Game Settings" IsVisible="{Binding CanChangeGameSettings}">
           <ScrollViewer>
@@ -39,7 +42,7 @@
         </TabItem>
         <TabItem Header="Interface/Controls">
           <ScrollViewer>
-            <avalonia:DynamicFormControl Data="{Binding Customizations}" Grid.IsSharedSizeScope="True"></avalonia:DynamicFormControl>
+            <avalonia:DynamicFormControl Data="{Binding Customizations}" Grid.IsSharedSizeScope="True" Margin="0 0 5 5"></avalonia:DynamicFormControl>
           </ScrollViewer>
         </TabItem>
       </TabControl>

src/TrackerCouncil.Smz3.UI/Views/GenerationSettingsWindow.axaml.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Interactivity;
 using AvaloniaControls.Controls;
 using AvaloniaControls.Models;
@@ -10,27 +12,26 @@
 using TrackerCouncil.Smz3.Data.ViewModels;
 using TrackerCouncil.Smz3.Shared.Enums;
 using TrackerCouncil.Smz3.Shared.Models;
+using Dispatcher = Avalonia.Threading.Dispatcher;
 
 namespace TrackerCouncil.Smz3.UI.Views;
 
 public partial class GenerationSettingsWindow : ScalableWindow
 {
-    private GenerationSettingsWindowService? _generationSettingsWindowService;
-    private IServiceProvider? _serviceProvider;
-    private IStatGenerator? _statGenerator;
-    private GenerationWindowViewModel? _model;
+    private readonly GenerationSettingsWindowService? _generationSettingsWindowService;
+    private readonly IServiceProvider? _serviceProvider;
+    private readonly GenerationWindowViewModel? _model;
 
     public GenerationSettingsWindow()
     {
         InitializeComponent();
         DataContext = new GenerationWindowViewModel();
     }
 
-    public GenerationSettingsWindow(GenerationSettingsWindowService generationSettingsWindowService, IServiceProvider serviceProvider, IStatGenerator statGenerator)
+    public GenerationSettingsWindow(GenerationSettingsWindowService generationSettingsWindowService, IServiceProvider serviceProvider)
     {
         _generationSettingsWindowService = generationSettingsWindowService;
         _serviceProvider = serviceProvider;
-        _statGenerator = statGenerator;
         InitializeComponent();
         DataContext = BasicPanel.Data = _model = _generationSettingsWindowService.GetViewModel();
         BasicPanel.SetServices(serviceProvider, generationSettingsWindowService);
@@ -60,7 +61,7 @@ public void EnableImportMode(ParsedRomDetails importDetails)
         {
             _model.Basic.CanSetMsu = false;
         }
-        
+
         _model.IsImportMode = true;
         _model.ImportDetails = importDetails;
     }
@@ -117,7 +118,7 @@ private async Task GenerateRom()
 
             window.ShowDialog();
 
-            window.Closed += (sender, args) =>
+            window.Closed += (_, _) =>
             {
                 if (generatedRom.Rom != null)
                 {
@@ -152,12 +153,12 @@ private void GenerateStatsMenuItem_OnClick(object? sender, RoutedEventArgs e)
         var statGenerator = _serviceProvider.GetRequiredService<IStatGenerator>();
         var statWindow = new ProgressWindow(this, "Generating stats test");
 
-        statGenerator.StatProgressUpdated += (o, args) =>
+        statGenerator.StatProgressUpdated += (_, args) =>
         {
             statWindow.Report(args.Current / (double)args.Total);
         };
 
-        statGenerator.StatsCompleted += (o, args) =>
+        statGenerator.StatsCompleted += (_, args) =>
         {
             statWindow.Close();
             var messageWindow = new MessageWindow(new MessageWindowRequest()
@@ -190,7 +191,7 @@ private void SavePresetMenuItem_OnClick(object? sender, RoutedEventArgs e)
             DisplayTextBox = true,
         });
 
-        window.Closed += (o, args) =>
+        window.Closed += (_, _) =>
         {
             if (window.DialogResult?.PressedAcceptButton != true)
             {
@@ -229,5 +230,35 @@ private void BasicPanel_OnDisplayed(object? sender, EventArgs e)
     {
         _generationSettingsWindowService?.UpdateSummaryText();
     }
+
+    private void TopLevel_OnOpened(object? sender, EventArgs e)
+    {
+        var val = Avalonia.VisualTree
+            .VisualExtensions
+            .GetTransformedBounds(this);
+
+        // Fix window on smaller displays
+        if (val is { Bounds.Height: < 750 })
+        {
+            Height = val.Value.Bounds.Height - 100;
+            var grid = this.Find<Grid>("MainGrid")!;
+            grid.IsVisible = false;
+            Task.Run(async () =>
+            {
+                await Task.Delay(TimeSpan.FromSeconds(0.25));
+                Dispatcher.UIThread.Invoke(() =>
+                {
+                    grid.IsVisible = true;
+                });
+
+            });
+        }
+
+        if (Position.Y is < 0 and > -200)
+        {
+            var newPos = new PixelPoint(Position.X, 0);
+            Position = newPos;
+        }
+    }
 }