UI: Preserve aspect ratio in game selection previews

Author: SourMesen

Core/Shared/SaveStateManager.cpp

@@ -282,6 +282,13 @@ void SaveStateManager::SaveRecentGame(string romName, string romPath, string pat
 	romInfoStream << romName << std::endl;
 	romInfoStream << romPath << std::endl;
 	romInfoStream << patchPath << std::endl;
+
+	FrameInfo baseFrameSize = _emu->GetVideoDecoder()->GetBaseFrameInfo(true);
+	double aspectRatio = _emu->GetSettings()->GetAspectRatio(_emu->GetRegion(), baseFrameSize);
+	if(aspectRatio > 0) {
+		romInfoStream << "aspectratio=" << aspectRatio << std::endl;
+	}
+
 	writer.AddFile(romInfoStream, "RomInfo.txt");
 	writer.Save();
 }

UI/Controls/ImageAspectRatio.cs

@@ -1,30 +1,37 @@
 using Avalonia;
 using Avalonia.Controls;
 using System;
-using Avalonia.Interactivity;
-using Avalonia.Styling;
-using Avalonia.Input;
-using Mesen.Debugger.Utilities;
-using System.Globalization;
 
 namespace Mesen.Controls
 {
 	public class ImageAspectRatio : Image
 	{
 		protected override Type StyleKeyOverride => typeof(Image);
+		
+		public static readonly StyledProperty<double> AspectRatioProperty = AvaloniaProperty.Register<StateGridEntry, double>(nameof(AspectRatio));
 
 		public ImageAspectRatio()
 		{
 		}
 
+		public double AspectRatio
+		{
+			get { return GetValue(AspectRatioProperty); }
+			set { SetValue(AspectRatioProperty, value); }
+		}
+
 		protected override Size ArrangeOverride(Size finalSize)
 		{
 			finalSize = base.ArrangeOverride(finalSize);
 			if(Source == null) {
 				return finalSize;
 			}
 
-			double ratio = Source.Size.Width / Source.Size.Height;
+			double ratio = AspectRatio;
+			if(ratio == 0) {
+				ratio = Source.Size.Width / Source.Size.Height;
+			}
+
 			if(finalSize.Width >= finalSize.Height * ratio) {
 				return new Size(finalSize.Height * ratio, finalSize.Height);
 			} else {

UI/Controls/StateGridEntry.axaml

@@ -59,6 +59,7 @@
 		>
 			<c:ImageAspectRatio
 				Source="{Binding Image, ElementName=root}"
+				AspectRatio="{Binding AspectRatio, ElementName=root}"
 				RenderOptions.BitmapInterpolationMode="LowQuality"
 				Stretch="Fill"
 				StretchDirection="Both"

UI/Controls/StateGridEntry.axaml.cs

@@ -8,7 +8,6 @@
 using Mesen.Localization;
 using Mesen.Utilities;
 using Mesen.ViewModels;
-using ReactiveUI.Fody.Helpers;
 using System;
 using System.IO;
 using System.IO.Compression;
@@ -26,6 +25,7 @@ public class StateGridEntry : UserControl
 		public static readonly StyledProperty<string> SubTitleProperty = AvaloniaProperty.Register<StateGridEntry, string>(nameof(SubTitle));
 		public static readonly StyledProperty<bool> EnabledProperty = AvaloniaProperty.Register<StateGridEntry, bool>(nameof(Enabled));
 		public static readonly StyledProperty<bool> IsActiveEntryProperty = AvaloniaProperty.Register<StateGridEntry, bool>(nameof(IsActiveEntry));
+		public static readonly StyledProperty<double> AspectRatioProperty = AvaloniaProperty.Register<StateGridEntry, double>(nameof(AspectRatio));
 
 		public RecentGameInfo Entry
 		{
@@ -39,6 +39,12 @@ public Bitmap? Image
 			set { SetValue(ImageProperty, value); }
 		}
 
+		public double AspectRatio
+		{
+			get { return GetValue(AspectRatioProperty); }
+			set { SetValue(AspectRatioProperty, value); }
+		}
+
 		public bool Enabled
 		{
 			get { return GetValue(EnabledProperty); }
@@ -120,6 +126,7 @@ public void Init()
 			if(fileExists) {
 				Task.Run(() => {
 					Bitmap? img = null;
+					double aspectRatio = 0;
 					try {
 						if(Path.GetExtension(game.FileName) == "." + FileDialogHelper.MesenSaveStateExt) {
 							img = EmuApi.GetSaveStatePreview(game.FileName);
@@ -138,12 +145,25 @@ public void Init()
 
 									img = new Bitmap(ms);
 								}
+
+								entry = zip.GetEntry("RomInfo.txt");
+								if(entry != null) {
+									using StreamReader reader = new StreamReader(entry.Open());
+									string? line = null;
+									while((line = reader.ReadLine()) != null) {
+										if(line.StartsWith("aspectratio=")) {
+											double.TryParse(line.Split('=')[1], out aspectRatio);
+											break;
+										}
+									}
+								}
 							}
 						}
 					} catch { }
 
 					Dispatcher.UIThread.Post(() => {
 						Image = img ?? StateGridEntry.EmptyImage;
+						AspectRatio = aspectRatio;
 					});
 				});
 			}