From da2bdbbd1f0ff67053e051b9a9e8a92a6b2cfda5 Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@live.com>
Date: Sat, 24 Aug 2024 15:11:52 -0600
Subject: [PATCH 1/3] Add margin around upgrade button on home screen

---
 .../Nerdbank.Zcash.App/Views/HomeScreenView.axaml               | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Nerdbank.Zcash.App/Nerdbank.Zcash.App/Views/HomeScreenView.axaml b/src/Nerdbank.Zcash.App/Nerdbank.Zcash.App/Views/HomeScreenView.axaml
index 8ef1e84a..09903a44 100644
--- a/src/Nerdbank.Zcash.App/Nerdbank.Zcash.App/Views/HomeScreenView.axaml
+++ b/src/Nerdbank.Zcash.App/Nerdbank.Zcash.App/Views/HomeScreenView.axaml
@@ -38,12 +38,14 @@
     <StackPanel DockPanel.Dock="Bottom"
                 DataContext="{Binding SelfUpdating}">
       <StackPanel DataContext="{Binding UpdateDownloading}"
+                  Margin="5"
                   IsVisible="{Binding IsInProgress}">
         <TextBlock Text="{Binding Caption}" HorizontalAlignment="Center" />
         <ProgressBar Value="{Binding Current}" Minimum="{Binding From}" Maximum="{Binding To}" />
       </StackPanel>
       <Button Command="{Binding UpdateAndRestartCommand}"
               Content="{Binding UpdateAndRestartCommandCaption}"
+              Margin="5"
               IsVisible="{Binding IsUpdateAndRestartCommandVisible}"
               HorizontalAlignment="Center" />
     </StackPanel>

From 5a09e03795d875c5272fa3ee8505967da9408561 Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@live.com>
Date: Sat, 24 Aug 2024 15:13:12 -0600
Subject: [PATCH 2/3] Fix default width of the window

---
 .../Nerdbank.Zcash.App/Views/MainWindow.axaml                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Nerdbank.Zcash.App/Nerdbank.Zcash.App/Views/MainWindow.axaml b/src/Nerdbank.Zcash.App/Nerdbank.Zcash.App/Views/MainWindow.axaml
index 15eed879..1d119537 100644
--- a/src/Nerdbank.Zcash.App/Nerdbank.Zcash.App/Views/MainWindow.axaml
+++ b/src/Nerdbank.Zcash.App/Nerdbank.Zcash.App/Views/MainWindow.axaml
@@ -4,8 +4,8 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:views="clr-namespace:Nerdbank.Zcash.App.Views"
-        mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="600"
-        Width="500" Height="650"
+        mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="650"
+        Width="600" Height="650"
         x:Class="Nerdbank.Zcash.App.Views.MainWindow"
         x:DataType="vm:MainWindowViewModel"
         Icon="/Assets/applogo.ico"

From aab4a30ee7a1cfbfafc6012eda017bd741143faf Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@live.com>
Date: Sat, 24 Aug 2024 19:10:34 -0600
Subject: [PATCH 3/3] Retain window size across sessions

---
 .../Nerdbank.Zcash.App/App.axaml.cs           | 18 ++++++++++++++++++
 .../Nerdbank.Zcash.App/AppSettings.cs         | 19 +++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/src/Nerdbank.Zcash.App/Nerdbank.Zcash.App/App.axaml.cs b/src/Nerdbank.Zcash.App/Nerdbank.Zcash.App/App.axaml.cs
index f96a8e85..d55d119b 100644
--- a/src/Nerdbank.Zcash.App/Nerdbank.Zcash.App/App.axaml.cs
+++ b/src/Nerdbank.Zcash.App/Nerdbank.Zcash.App/App.axaml.cs
@@ -117,6 +117,24 @@ public override void OnFrameworkInitializationCompleted()
 			}
 
 			this.ViewModel.TopLevel = TopLevel.GetTopLevel(desktop.MainWindow);
+
+			// Remember the size of the window.
+			if (desktop.MainWindow.CanResize && this.settings is not null)
+			{
+				if (this.settings?.WindowSize is Size size)
+				{
+					desktop.MainWindow.Width = size.Width;
+					desktop.MainWindow.Height = size.Height;
+				}
+
+				desktop.MainWindow.Resized += (s, e) =>
+				{
+					if (this.settings is not null)
+					{
+						this.settings.WindowSize = new(desktop.MainWindow.Width, desktop.MainWindow.Height);
+					}
+				};
+			}
 		}
 		else if (this.ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
 		{
diff --git a/src/Nerdbank.Zcash.App/Nerdbank.Zcash.App/AppSettings.cs b/src/Nerdbank.Zcash.App/Nerdbank.Zcash.App/AppSettings.cs
index 5c31b626..aa7e3393 100644
--- a/src/Nerdbank.Zcash.App/Nerdbank.Zcash.App/AppSettings.cs
+++ b/src/Nerdbank.Zcash.App/Nerdbank.Zcash.App/AppSettings.cs
@@ -4,6 +4,7 @@
 using System.ComponentModel;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Avalonia;
 using Nerdbank.Cryptocurrencies;
 
 namespace Nerdbank.Zcash.App;
@@ -84,6 +85,18 @@ public string? LastUsedAccountName
 		set => this.RaiseAndSetIfChanged(ref this.lastUsedAccountName, value);
 	}
 
+	[JsonIgnore]
+	public Size? WindowSize
+	{
+		get => this.WindowWidth is double w && this.WindowHeight is double h ? new(w, h) : null;
+		set
+		{
+			this.WindowWidth = value?.Width;
+			this.WindowHeight = value?.Height;
+			this.RaisePropertyChanged();
+		}
+	}
+
 	/// <summary>
 	/// Gets or sets a value indicating whether exchange rates will be automatically downloaded.
 	/// </summary>
@@ -112,6 +125,12 @@ public bool IsDirty
 		set => this.RaiseAndSetIfChanged(ref this.isDirty, value);
 	}
 
+	[JsonInclude]
+	internal double? WindowWidth { get; set; }
+
+	[JsonInclude]
+	internal double? WindowHeight { get; set; }
+
 	public static AppSettings Load(Stream stream) => JsonSerializer.Deserialize(stream, JsonSourceGenerationContext.Default.AppSettings)!;
 
 	public Task SaveAsync(Stream stream, CancellationToken cancellationToken) => JsonSerializer.SerializeAsync(stream, this, JsonSourceGenerationContext.Default.AppSettings, cancellationToken);