From 83bc664a30905bf6adddb15c8f336056e079056e Mon Sep 17 00:00:00 2001
From: Yusyuriv <Yusyuriv@users.noreply.github.com>
Date: Mon, 27 May 2024 12:26:14 +0600
Subject: [PATCH] Fix memory leak in ResultViewModel

---
 Flow.Launcher/ResultListBox.xaml           |  6 ++--
 Flow.Launcher/ViewModel/ResultViewModel.cs | 37 ++--------------------
 2 files changed, 5 insertions(+), 38 deletions(-)

diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index 382b7c2e4..7dc036afb 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -175,7 +175,7 @@
                                 Margin="0,0,0,1"
                                 VerticalAlignment="Bottom"
                                 DockPanel.Dock="Left"
-                                FontSize="{Binding ResultItemFontSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                FontSize="{Binding Settings.ResultItemFontSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                 IsEnabled="False"
                                 Style="{DynamicResource ItemTitleStyle}"
                                 Text="{Binding Result.Title}"
@@ -194,7 +194,7 @@
                                 Grid.Row="1"
                                 Margin="0,1,0,0"
                                 VerticalAlignment="Top"
-                                FontSize="{Binding ResultSubItemFontSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                FontSize="{Binding Settings.ResultSubItemFontSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                 IsEnabled="False"
                                 Style="{DynamicResource ItemSubTitleStyle}"
                                 Text="{Binding Result.SubTitle}"
@@ -224,7 +224,7 @@
         <Style TargetType="{x:Type ListBoxItem}">
             <EventSetter Event="MouseEnter" Handler="OnMouseEnter" />
             <EventSetter Event="MouseMove" Handler="OnMouseMove" />
-            <Setter Property="Height" Value="{Binding ItemHeightSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+            <Setter Property="Height" Value="{Binding Settings.ItemHeightSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
             <Setter Property="Margin" Value="0" />
             <Setter Property="Padding" Value="0" />
             <Setter Property="BorderThickness" Value="0" />
diff --git a/Flow.Launcher/ViewModel/ResultViewModel.cs b/Flow.Launcher/ViewModel/ResultViewModel.cs
index e362cff84..7e45d95c4 100644
--- a/Flow.Launcher/ViewModel/ResultViewModel.cs
+++ b/Flow.Launcher/ViewModel/ResultViewModel.cs
@@ -21,22 +21,6 @@ namespace Flow.Launcher.ViewModel
         {
             Settings = settings;
 
-            Settings.PropertyChanged += (_, args) =>
-            {
-                switch (args.PropertyName)
-                {
-                    case nameof(Settings.ItemHeightSize):
-                        OnPropertyChanged(nameof(ItemHeightSize));
-                        break;
-                    case nameof(Settings.ResultItemFontSize):
-                        OnPropertyChanged(nameof(ResultItemFontSize));
-                        break;
-                    case nameof(Settings.ResultSubItemFontSize):
-                        OnPropertyChanged(nameof(ResultSubItemFontSize));
-                        break;
-                }
-            };
-
 
             if (result == null)
             {
@@ -46,7 +30,7 @@ namespace Flow.Launcher.ViewModel
 
             if (Result.Glyph is { FontFamily: not null } glyph)
             {
-                // Checks if it's a system installed font, which does not require path to be provided. 
+                // Checks if it's a system installed font, which does not require path to be provided.
                 if (glyph.FontFamily.EndsWith(".ttf") || glyph.FontFamily.EndsWith(".otf"))
                 {
                     string fontFamilyPath = glyph.FontFamily;
@@ -81,7 +65,7 @@ namespace Flow.Launcher.ViewModel
 
         }
 
-        private Settings Settings { get; }
+        public Settings Settings { get; }
 
         public Visibility ShowOpenResultHotkey =>
             Settings.ShowOpenResultHotkey ? Visibility.Visible : Visibility.Collapsed;
@@ -136,23 +120,6 @@ namespace Flow.Launcher.ViewModel
 
         }
 
-        public double ItemHeightSize
-        {
-            get => Settings.ItemHeightSize;
-            set => Settings.ItemHeightSize = value;
-        }
-
-        public double ResultItemFontSize
-        {
-            get => Settings.ResultItemFontSize;
-            set => Settings.ResultItemFontSize = value;
-        }
-
-        public double ResultSubItemFontSize
-        {
-            get => Settings.ResultSubItemFontSize;
-            set => Settings.ResultSubItemFontSize = value;
-        }
         public Visibility ShowGlyph
         {
             get