Merge pull request #1768 from Flow-Launcher/dynamic_height

Author: onesounds

.github/actions/spelling/expect.txt

@@ -62,3 +62,25 @@ TobiasSekan
 Img
 img
 resx
+directx
+mvvm
+dlg
+ddd
+dddd
+clearlogfolder
+ACCENT_ENABLE_TRANSPARENTGRADIENT
+ACCENT_ENABLE_BLURBEHIND
+WCA_ACCENT_POLICY
+HGlobal
+dopusrt
+firefox
+msedge
+svgc
+ime
+zindex
+txb
+btn
+otf
+searchplugin
+Noresult
+wpftk

Flow.Launcher.Core/Resource/Theme.cs

@@ -36,7 +36,7 @@ public Theme()
         {
             _themeDirectories.Add(DirectoryPath);
             _themeDirectories.Add(UserDirectoryPath);
-            MakesureThemeDirectoriesExist();
+            MakeSureThemeDirectoriesExist();
 
             var dicts = Application.Current.Resources.MergedDictionaries;
             _oldResource = dicts.First(d =>
@@ -55,20 +55,17 @@ public Theme()
             _oldTheme = Path.GetFileNameWithoutExtension(_oldResource.Source.AbsolutePath);
         }
 
-        private void MakesureThemeDirectoriesExist()
+        private void MakeSureThemeDirectoriesExist()
         {
-            foreach (string dir in _themeDirectories)
+            foreach (var dir in _themeDirectories.Where(dir => !Directory.Exists(dir)))
             {
-                if (!Directory.Exists(dir))
+                try
                 {
-                    try
-                    {
-                        Directory.CreateDirectory(dir);
-                    }
-                    catch (Exception e)
-                    {
-                        Log.Exception($"|Theme.MakesureThemeDirectoriesExist|Exception when create directory <{dir}>", e);
-                    }
+                    Directory.CreateDirectory(dir);
+                }
+                catch (Exception e)
+                {
+                    Log.Exception($"|Theme.MakesureThemeDirectoriesExist|Exception when create directory <{dir}>", e);
                 }
             }
         }
@@ -82,13 +79,14 @@ public bool ChangeTheme(string theme)
             {
                 if (string.IsNullOrEmpty(path))
                     throw new DirectoryNotFoundException("Theme path can't be found <{path}>");
-
-                Settings.Theme = theme;
-
+                
                 // reload all resources even if the theme itself hasn't changed in order to pickup changes
                 // to things like fonts
-                UpdateResourceDictionary(GetResourceDictionary());
+                UpdateResourceDictionary(GetResourceDictionary(theme));
+                
+                Settings.Theme = theme;
 
+                
                 //always allow re-loading default theme, in case of failure of switching to a new theme from default theme
                 if (_oldTheme != theme || theme == defaultTheme)
                 {
@@ -134,9 +132,9 @@ private void UpdateResourceDictionary(ResourceDictionary dictionaryToUpdate)
             _oldResource = dictionaryToUpdate;
         }
 
-        private ResourceDictionary CurrentThemeResourceDictionary()
+        private ResourceDictionary GetThemeResourceDictionary(string theme)
         {
-            var uri = GetThemePath(Settings.Theme);
+            var uri = GetThemePath(theme);
             var dict = new ResourceDictionary
             {
                 Source = new Uri(uri, UriKind.Absolute)
@@ -145,10 +143,12 @@ private ResourceDictionary CurrentThemeResourceDictionary()
             return dict;
         }
 
-        public ResourceDictionary GetResourceDictionary()
+        private ResourceDictionary CurrentThemeResourceDictionary() => GetThemeResourceDictionary(Settings.Theme);
+
+        public ResourceDictionary GetResourceDictionary(string theme)
         {
-            var dict = CurrentThemeResourceDictionary();
-           
+            var dict = GetThemeResourceDictionary(theme);
+            
             if (dict["QueryBoxStyle"] is Style queryBoxStyle &&
                 dict["QuerySuggestionBoxStyle"] is Style querySuggestionBoxStyle)
             {
@@ -200,6 +200,11 @@ public ResourceDictionary GetResourceDictionary()
             return dict;
         }
 
+        private ResourceDictionary GetCurrentResourceDictionary( )
+        {
+            return  GetResourceDictionary(Settings.Theme);
+        }
+
         public List<string> LoadAvailableThemes()
         {
             List<string> themes = new List<string>();
@@ -229,7 +234,7 @@ private string GetThemePath(string themeName)
 
         public void AddDropShadowEffectToCurrentTheme()
         {
-            var dict = GetResourceDictionary();
+            var dict = GetCurrentResourceDictionary();
 
             var windowBorderStyle = dict["WindowBorderStyle"] as Style;
 
@@ -273,7 +278,7 @@ public void AddDropShadowEffectToCurrentTheme()
 
         public void RemoveDropShadowEffectFromCurrentTheme()
         {
-            var dict = CurrentThemeResourceDictionary();
+            var dict = GetCurrentResourceDictionary();
             var windowBorderStyle = dict["WindowBorderStyle"] as Style;
 
             var effectSetter = windowBorderStyle.Setters.FirstOrDefault(setterBase => setterBase is Setter setter && setter.Property == Border.EffectProperty) as Setter;

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -13,6 +13,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings
     public class Settings : BaseModel
     {
         private string language = "en";
+        private string _theme = Constant.DefaultTheme;
         public string Hotkey { get; set; } = $"{KeyConstant.Alt} + {KeyConstant.Space}";
         public string OpenResultModifiers { get; set; } = KeyConstant.Alt;
         public string ColorScheme { get; set; } = "System";
@@ -29,7 +30,18 @@ public string Language
                 OnPropertyChanged();
             }
         }
-        public string Theme { get; set; } = Constant.DefaultTheme;
+        public string Theme
+        {
+            get => _theme;
+            set
+            {
+                if (value == _theme)
+                    return;
+                _theme = value;
+                OnPropertyChanged();
+                OnPropertyChanged(nameof(MaxResultsToShow));
+            }
+        }
         public bool UseDropShadowEffect { get; set; } = false;
         public string QueryBoxFont { get; set; } = FontFamily.GenericSansSerif.Name;
         public string QueryBoxFontStyle { get; set; }
@@ -214,7 +226,7 @@ public bool HideNotifyIcon
             }
         }
         public bool LeaveCmdOpen { get; set; }
-        public bool HideWhenDeactive { get; set; } = true;
+        public bool HideWhenDeactivated { get; set; } = true;
         public SearchWindowPositions SearchWindowPosition { get; set; } = SearchWindowPositions.MouseScreenCenter;
         public bool IgnoreHotkeysOnFullscreen { get; set; }
 

Flow.Launcher/Converters/DiameterToCenterPointConverter.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Flow.Launcher.Converters
+{
+    public class DiameterToCenterPointConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is double d)
+            {
+                return new Point(d / 2, d / 2);
+            }
+
+            return new Point(0, 0);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotSupportedException();
+        }
+    }
+}

Flow.Launcher/Converters/IconRadiusConverter.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using Windows.Devices.PointOfService;
+
+namespace Flow.Launcher.Converters
+{
+    public class IconRadiusConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (values.Length != 2)
+                throw new ArgumentException("IconRadiusConverter must have 2 parameters");
+
+            return values[1] switch
+            {
+                true => (double)values[0] / 2,
+                false => (double)values[0],
+                _ => throw new ArgumentException("The second argument should be boolean", nameof(values))
+            };
+        }
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotSupportedException();
+        }
+    }
+}

Flow.Launcher/MainWindow.xaml

@@ -9,11 +9,11 @@
     xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
     xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
-    d:DataContext="{d:DesignInstance Type=vm:MainViewModel}"
     Name="FlowMainWindow"
     Title="Flow Launcher"
     MinWidth="{Binding MainWindowWidth, Mode=OneWay}"
     MaxWidth="{Binding MainWindowWidth, Mode=OneWay}"
+    d:DataContext="{d:DesignInstance Type=vm:MainViewModel}"
     AllowDrop="True"
     AllowsTransparency="True"
     Background="Transparent"
@@ -38,9 +38,9 @@
         <converters:QuerySuggestionBoxConverter x:Key="QuerySuggestionBoxConverter" />
         <converters:BorderClipConverter x:Key="BorderClipConverter" />
         <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-        <converters:BoolToIMEConversionModeConverter x:Key="BoolToIMEConversionModeConverter"/>
-        <converters:BoolToIMEStateConverter x:Key="BoolToIMEStateConverter"/>
-        <converters:StringToKeyBindingConverter x:Key="StringToKeyBindingConverter"/>
+        <converters:BoolToIMEConversionModeConverter x:Key="BoolToIMEConversionModeConverter" />
+        <converters:BoolToIMEStateConverter x:Key="BoolToIMEStateConverter" />
+        <converters:StringToKeyBindingConverter x:Key="StringToKeyBindingConverter" />
     </Window.Resources>
     <Window.InputBindings>
         <KeyBinding Key="Escape" Command="{Binding EscCommand}" />
@@ -180,11 +180,11 @@
         <KeyBinding
             Key="F12"
             Command="{Binding ToggleGameModeCommand}"
-            Modifiers="Ctrl"/>
+            Modifiers="Ctrl" />
         <KeyBinding
             Key="{Binding PreviewHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='key'}"
             Command="{Binding TogglePreviewCommand}"
-            Modifiers="{Binding PreviewHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='modifiers'}"/>
+            Modifiers="{Binding PreviewHotkey, Converter={StaticResource StringToKeyBindingConverter}, ConverterParameter='modifiers'}" />
     </Window.InputBindings>
     <Grid>
         <Border MouseDown="OnMouseDown" Style="{DynamicResource WindowBorderStyle}">
@@ -207,12 +207,12 @@
                             <TextBox
                                 x:Name="QueryTextBox"
                                 AllowDrop="True"
+                                InputMethod.PreferredImeConversionMode="{Binding StartWithEnglishMode, Converter={StaticResource BoolToIMEConversionModeConverter}}"
+                                InputMethod.PreferredImeState="{Binding StartWithEnglishMode, Converter={StaticResource BoolToIMEStateConverter}}"
                                 PreviewDragOver="OnPreviewDragOver"
                                 PreviewKeyUp="QueryTextBox_KeyUp"
                                 Style="{DynamicResource QueryBoxStyle}"
                                 Text="{Binding QueryText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                InputMethod.PreferredImeConversionMode="{Binding StartWithEnglishMode, Converter={StaticResource BoolToIMEConversionModeConverter}}"
-                                InputMethod.PreferredImeState="{Binding StartWithEnglishMode, Converter={StaticResource BoolToIMEStateConverter}}"
                                 Visibility="Visible">
                                 <TextBox.CommandBindings>
                                     <CommandBinding Command="ApplicationCommands.Copy" Executed="OnCopy" />
@@ -273,9 +273,6 @@
                         <Grid>
                             <Image
                                 x:Name="PluginActivationIcon"
-                                Width="32"
-                                Height="32"
-                                Margin="0,0,18,0"
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Center"
                                 Panel.ZIndex="2"
@@ -403,10 +400,10 @@
                         VerticalAlignment="Stretch"
                         Style="{DynamicResource PreviewArea}"
                         Visibility="{Binding PreviewVisible, Converter={StaticResource BoolToVisibilityConverter}}">
-                        <Border 
-                            Style="{DynamicResource PreviewBorderStyle}" 
+                        <Border
                             d:DataContext="{d:DesignInstance vm:ResultViewModel}"
                             DataContext="{Binding SelectedItem, ElementName=ResultListBox}"
+                            Style="{DynamicResource PreviewBorderStyle}"
                             Visibility="{Binding ShowDefaultPreview}">
                             <Grid
                                 Margin="20,0,10,0"
@@ -478,10 +475,10 @@
                                 </StackPanel>
                             </Grid>
                         </Border>
-                        <Border 
+                        <Border
                             d:DataContext="{d:DesignInstance vm:ResultViewModel}"
                             DataContext="{Binding SelectedItem, ElementName=ResultListBox}"
-                            Style="{DynamicResource PreviewBorderStyle}" 
+                            Style="{DynamicResource PreviewBorderStyle}"
                             Visibility="{Binding ShowCustomizedPreview}">
                             <ContentControl Content="{Binding Result.PreviewPanel.Value}" />
                         </Border>

Flow.Launcher/MainWindow.xaml.cs

@@ -485,7 +485,7 @@ private async void OnDeactivated(object sender, EventArgs e)
                 if (_settings.UseAnimation)
                     await Task.Delay(100);
 
-                if (_settings.HideWhenDeactive)
+                if (_settings.HideWhenDeactivated)
                 {
                     _viewModel.Hide();
                 }