Fixed scaling issue

AlexanderDotH · Mar 28, 2023 · 192fec3 · 192fec3
1 parent 8d98832
commit 192fec3
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 3 deletions.
diff --git a/OpenLyricsClient/App.axaml.cs b/OpenLyricsClient/App.axaml.cs
@@ -47,7 +47,7 @@ public override void OnFrameworkInitializationCompleted()
                 desktop.Startup += Startup;
                 desktop.Exit += Exit;
 
-                //manager.SetScaling(1);
+                manager.OnlyScaleOnStartup = true;
                 manager.SetScaling(WindowUtils.GetScalingFactor());
             }
 

diff --git a/OpenLyricsClient/Frontend/Models/Windows/MainWindowViewModel.cs b/OpenLyricsClient/Frontend/Models/Windows/MainWindowViewModel.cs
@@ -2,6 +2,8 @@
 using System.Reactive;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Input;
+using OpenLyricsClient.Frontend.Scaling;
 using ReactiveUI;
 using IViewModel = OpenLyricsClient.Frontend.Scaling.IViewModel;
 
@@ -74,11 +76,14 @@ private void FullButtonAction()
                     this._prevWidth = desktop.MainWindow.Width;
                     this._prevHeight = desktop.MainWindow.Height;
                     desktop.MainWindow.WindowState = WindowState.FullScreen;
+
                     this._isFullScreen = true;
                 }
                 else
                 {
+
                     desktop.MainWindow.WindowState = WindowState.Normal;
+
                     desktop.MainWindow.Width = this._prevWidth;
                     desktop.MainWindow.Height = this._prevHeight;
                     this._isFullScreen = false;

diff --git a/OpenLyricsClient/Frontend/Scaling/ScalingManager.cs b/OpenLyricsClient/Frontend/Scaling/ScalingManager.cs
@@ -14,6 +14,8 @@ namespace OpenLyricsClient.Frontend.Scaling;
     /// </summary>
     public class ScalingManager
     {
+        private static ScalingManager _instance;
+
         private const double minimumScaling = 0.2d;
 
         private double previousScaling = 1d;
@@ -54,6 +56,7 @@ public class ScalingManager
         /// <param name="viewModel">The <see cref="IViewModel"/> implemented by the view model belonging to the <paramref name="window"/>.</param>
         public ScalingManager(ScalableWindow window, IViewModel viewModel)
         {
+            _instance = this;
             this.viewModel = viewModel;
             this.window = window;
             ScalableMainWindow = new ScalableObject(window); 
@@ -100,6 +103,7 @@ public ScalingManager(ScalableWindow window, IViewModel viewModel)
         private double windowScalingFactor = 1d;
         private Point mouseDownPosition = default;
         private bool windowNeedsRefresh = false;
+        private bool onlyScaleOnStartup = false;
 
         private void Window_EndResize(object? sender, PointerReleasedEventArgs e)
         {
@@ -149,6 +153,9 @@ private void Window_PositionChanged(object? sender, PixelPointEventArgs e)
 
         private void Window_PropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
         {
+            if (onlyScaleOnStartup)
+                return;
+
             Type propertyType = e.Property.PropertyType;
             if (propertyType == typeof(WindowState))
             {
@@ -308,4 +315,21 @@ public static void RegisterControls(Queue<IEnumerable<ILogical>> logicals, Bindi
                 }
             }
         }
+
+        public bool OnlyScaleOnStartup
+        {
+            get => onlyScaleOnStartup;
+            set => onlyScaleOnStartup = value;
+        }
+
+        public bool WindowNeedsRefresh
+        {
+            get => windowNeedsRefresh;
+            set => windowNeedsRefresh = value;
+        }
+
+        public static ScalingManager Instance
+        {
+            get => _instance;
+        }
     }
diff --git a/OpenLyricsClient/Frontend/View/Pages/LyricsPage.axaml.cs b/OpenLyricsClient/Frontend/View/Pages/LyricsPage.axaml.cs
@@ -98,8 +98,8 @@ private void DataContextOnPropertyChanged(object? sender, PropertyChangedEventAr
         if (e.PropertyName.IsNullOrEmpty())
             return;
 
-        if (DataValidator.ValidateData(this._lyricsPageViewModel?.Artwork!) && 
-            !this._lyricsPageViewModel!.Artwork.IsNullOrEmpty() &&
+        if (DataValidator.ValidateData(this._lyricsPageViewModel.Artwork!) && 
+            !this._lyricsPageViewModel.Artwork.IsNullOrEmpty() &&
             e.PropertyName!.Equals("Artwork") && 
             !this._oldImagePath.Equals(this._lyricsPageViewModel.Artwork))
         {

diff --git a/OpenLyricsClient/Frontend/View/Windows/MainWindow.axaml.cs b/OpenLyricsClient/Frontend/View/Windows/MainWindow.axaml.cs
@@ -116,5 +116,6 @@ private void InputElement_OnPointerPressed(object? sender, PointerPressedEventAr
         public override event EventHandler<PointerPressedEventArgs> BeginResize;
         public override event EventHandler<PointerEventArgs> Resize;
         public override event EventHandler<PointerReleasedEventArgs> EndResize;
+
     }
 }