Resizeable window: fixes after review

Author: Yusyuriv

Flow.Launcher/MainWindow.xaml

@@ -30,7 +30,6 @@
     PreviewKeyUp="OnKeyUp"
     ResizeMode="CanResize"
     ShowInTaskbar="False"
-    SizeChanged="OnSizeChanged"
     SizeToContent="Height"
     Topmost="True"
     Visibility="{Binding MainWindowVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"

Flow.Launcher/MainWindow.xaml.cs

@@ -64,11 +64,11 @@ public MainWindow(Settings settings, MainViewModel mainVM)
 
             DataObject.AddPastingHandler(QueryTextBox, OnPaste);
 
-            this.Loaded += (obj, args) =>
+            this.Loaded += (_, _) =>
             {
                 var handle = new WindowInteropHelper(this).Handle;
                 var win = HwndSource.FromHwnd(handle);
-                win.AddHook(new HwndSourceHook(WndProc));
+                win.AddHook(WndProc);
             };
         }
 
@@ -83,20 +83,12 @@ public MainWindow()
             InitializeComponent();
         }
 
-        private void OnSizeChanged(object sender, SizeChangedEventArgs e)
-        {
-
-        }
-
         private const int WM_ENTERSIZEMOVE = 0x0231;
         private const int WM_EXITSIZEMOVE = 0x0232;
-        public event EventHandler ResizeBegin;
-        public event EventHandler ResizeEnd;
         private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
         {
             if (msg == WM_ENTERSIZEMOVE)
             {
-                OnResizeBegin();
                 handled = true;
             }
             if (msg == WM_EXITSIZEMOVE)
@@ -107,11 +99,6 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
             return IntPtr.Zero;
         }
 
-        private void OnResizeBegin()
-        {
-
-        }
-
         private void OnResizeEnd()
         {
             int shadowMargin = 0;
@@ -120,14 +107,17 @@ private void OnResizeEnd()
                 shadowMargin = 32;
             }
 
-            if (!_settings.KeepMaxResults) { 
-                if (System.Convert.ToInt32((Height - (_settings.WindowHeightSize + 14) - shadowMargin) / _settings.ItemHeightSize) < 1)
+            if (!_settings.KeepMaxResults)
+            {
+                var itemCount = (Height - (_settings.WindowHeightSize + 14) - shadowMargin) / _settings.ItemHeightSize;
+
+                if (itemCount < 2)
                 {
                     _settings.MaxResultsToShow = 2;
                 }
                 else
                 {
-                    _settings.MaxResultsToShow = System.Convert.ToInt32(Math.Truncate((Height - (_settings.WindowHeightSize + 14) - shadowMargin) / _settings.ItemHeightSize));
+                    _settings.MaxResultsToShow = Convert.ToInt32(Math.Truncate(itemCount));
                 }
             }
 
@@ -161,7 +151,7 @@ private void OnPaste(object sender, DataObjectPastingEventArgs e)
                 e.DataObject = data;
             }
         }
-        
+
         private async void OnClosing(object sender, CancelEventArgs e)
         {
             _notifyIcon.Visible = false;
@@ -622,11 +612,11 @@ private async void OnDeactivated(object sender, EventArgs e)
         {
             _settings.WindowLeft = Left;
             _settings.WindowTop = Top;
-            //This condition stops extra hide call when animator is on, 
+            //This condition stops extra hide call when animator is on,
             // which causes the toggling to occasional hide instead of show.
             if (_viewModel.MainWindowVisibilityStatus)
             {
-                // Need time to initialize the main query window animation. 
+                // Need time to initialize the main query window animation.
                 // This also stops the mainwindow from flickering occasionally after Settings window is opened
                 // and always after Settings window is closed.
                 if (_settings.UseAnimation)
@@ -697,7 +687,7 @@ public Screen SelectedScreen()
             }
             return screen ?? Screen.AllScreens[0];
         }
-        
+
         public double HorizonCenter(Screen screen)
         {
             var dip1 = WindowsInteropHelper.TransformPixelsToDIP(this, screen.WorkingArea.X, 0);

Flow.Launcher/ResultListBox.xaml

@@ -209,7 +209,6 @@
             <!--  a result item height is 52 including margin  -->
             <DataTemplate.Triggers>
                 <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}" Value="True">
-
                     <Setter TargetName="Bullet" Property="Style" Value="{DynamicResource ItemBulletSelectedStyle}" />
                     <Setter TargetName="Title" Property="Style" Value="{DynamicResource ItemTitleSelectedStyle}" />
                     <Setter TargetName="SubTitle" Property="Style" Value="{DynamicResource ItemSubTitleSelectedStyle}" />

Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs

@@ -150,12 +150,6 @@ public bool ShouldUsePinyin
         .ToList();
 
     public List<Language> Languages => InternationalizationManager.Instance.LoadAvailableLanguages();
-    public IEnumerable<int> MaxResultsRange => Enumerable.Range(2, 16);
-    public bool KeepMaxResults
-    {
-        get => Settings.KeepMaxResults;
-        set => Settings.KeepMaxResults = value;
-    }
 
     public string AlwaysPreviewToolTip => string.Format(
         InternationalizationManager.Instance.GetTranslation("AlwaysPreviewToolTip"),

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Drawing;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
@@ -32,7 +31,7 @@ private void Selector_OnSelectionChanged(object sender, SelectionChangedEventArg
         _viewModel.UpdateColorScheme();
     }
 
-    private void Reset_Click(object sender, System.Windows.RoutedEventArgs e)
+    private void Reset_Click(object sender, RoutedEventArgs e)
     {
         /*The FamilyTypeface should initialize all of its various properties.*/
         FamilyTypeface targetTypeface = new FamilyTypeface { Stretch = FontStretches.Normal, Weight = FontWeights.Normal, Style = FontStyles.Normal };
@@ -52,56 +51,31 @@ private void Reset_Click(object sender, System.Windows.RoutedEventArgs e)
         WindowHeightValue.Value = 42;
         ItemHeightValue.Value = 58;
     }
-    public int SearchFontIndex(string str, ComboBox combo)
-    {
-        int index = -1;
-        string targetFont = str;
 
+    private int SearchFontIndex(string targetFont, ComboBox combo)
+    {
         for (int i = 0; i < combo.Items.Count; i++)
         {
-            if (combo.Items[i].ToString() == targetFont)
+            if (combo.Items[i]?.ToString() == targetFont)
             {
-                index = i;
-                break;
+                return i;
             }
         }
-
-        if (index != -1)
-        {
-            return index;
-        }
-        else
-        {
-            // If there no Default Value.
-            return 0;
-        }
+        return 0;
     }
-    public int SearchFontStyleIndex(FamilyTypeface targetTypeface, ComboBox combo)
-    {
-        int index = -1;
 
+    private int SearchFontStyleIndex(FamilyTypeface targetTypeface, ComboBox combo)
+    {
         for (int i = 0; i < combo.Items.Count; i++)
         {
-            if (combo.Items[i] is FamilyTypeface)
+            if (combo.Items[i] is FamilyTypeface typefaceItem &&
+                typefaceItem.Stretch == targetTypeface.Stretch &&
+                typefaceItem.Weight == targetTypeface.Weight &&
+                typefaceItem.Style == targetTypeface.Style)
             {
-                FamilyTypeface typefaceItem = (FamilyTypeface)combo.Items[i];
-                if (typefaceItem.Stretch == targetTypeface.Stretch &&
-                    typefaceItem.Weight == targetTypeface.Weight &&
-                    typefaceItem.Style == targetTypeface.Style)
-                {
-                    index = i;
-                    break;
-                }
+                return i;
             }
         }
-
-        if (index != -1)
-        {
-            return index;
-        }
-        else
-        {
-            return 0;
-        }
+        return 0;
     }
 }

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -19,13 +19,10 @@
 using System.Text;
 using System.Threading.Channels;
 using ISavable = Flow.Launcher.Plugin.ISavable;
-using System.IO;
-using System.Collections.Specialized;
 using CommunityToolkit.Mvvm.Input;
 using System.Globalization;
 using System.Windows.Input;
 using System.ComponentModel;
-using Windows.UI.Core.AnimationMetrics;
 
 namespace Flow.Launcher.ViewModel
 {
@@ -455,7 +452,7 @@ private void SelectPrevItem()
             {
                 SelectedResults.SelectPrevResult();
             }
-        
+
         }
 
         [RelayCommand]
@@ -482,7 +479,7 @@ public void ToggleGameMode()
         {
             GameModeStatus = !GameModeStatus;
         }
-        
+
         [RelayCommand]
         public void CopyAlternative()
         {
@@ -760,7 +757,7 @@ public string VerifyOrSetDefaultHotkey(string hotkey, string defaultHotkey)
 
             return hotkey;
         }
-        
+
         public string PreviewHotkey => VerifyOrSetDefaultHotkey(Settings.PreviewHotkey, "F1");
         public string AutoCompleteHotkey => VerifyOrSetDefaultHotkey(Settings.AutoCompleteHotkey, "Ctrl+Tab");
         public string AutoCompleteHotkey2 => VerifyOrSetDefaultHotkey(Settings.AutoCompleteHotkey2, "");

Flow.Launcher/ViewModel/ResultViewModel.cs

@@ -21,7 +21,6 @@ public ResultViewModel(Result result, Settings settings)
         {
             Settings = settings;
 
-
             if (result == null)
             {
                 return;

Flow.Launcher/ViewModel/ResultsViewModel.cs

@@ -49,7 +49,7 @@ public ResultsViewModel(Settings settings) : this()
 
         #region Properties
 
-        public double MaxHeight => MaxResults * _settings.ItemHeightSize!;
+        public double MaxHeight => MaxResults * _settings.ItemHeightSize;
         public double ItemHeightSize
         {
             get => _settings.ItemHeightSize;
@@ -61,7 +61,7 @@ public double ItemHeightSize
         public ResultViewModel SelectedItem { get; set; }
         public Thickness Margin { get; set; }
         public Visibility Visibility { get; set; } = Visibility.Collapsed;
-        
+
         public ICommand RightClickResultCommand { get; init; }
         public ICommand LeftClickResultCommand { get; init; }