Merge branch 'dev' into 050328-NewHotkeyDesign

# Conflicts:
#	Flow.Launcher/Themes/Discord Dark.xaml

Author: onesounds

Flow.Launcher.Core/Resource/Theme.cs

@@ -24,7 +24,7 @@ public class Theme
     {
         #region Properties & Fields
 
-        public bool BlurEnabled { get; set; }
+        public bool BlurEnabled { get; private set; }
 
         private const string ThemeMetadataNamePrefix = "Name:";
         private const string ThemeMetadataIsDarkPrefix = "IsDark:";
@@ -42,6 +42,8 @@ public class Theme
         private static string DirectoryPath => Path.Combine(Constant.ProgramDirectory, Folder);
         private static string UserDirectoryPath => Path.Combine(DataLocation.DataDirectory(), Folder);
 
+        private Thickness _themeResizeBorderThickness;
+
         #endregion
 
         #region Constructor
@@ -463,7 +465,7 @@ public void AddDropShadowEffectToCurrentTheme()
 
             var effectSetter = new Setter
             {
-                Property = Border.EffectProperty,
+                Property = UIElement.EffectProperty,
                 Value = new DropShadowEffect
                 {
                     Opacity = 0.3,
@@ -473,12 +475,12 @@ public void AddDropShadowEffectToCurrentTheme()
                 }
             };
 
-            if (windowBorderStyle.Setters.FirstOrDefault(setterBase => setterBase is Setter setter && setter.Property == Border.MarginProperty) is not Setter marginSetter)
+            if (windowBorderStyle.Setters.FirstOrDefault(setterBase => setterBase is Setter setter && setter.Property == FrameworkElement.MarginProperty) is not Setter marginSetter)
             {
                 var margin = new Thickness(ShadowExtraMargin, 12, ShadowExtraMargin, ShadowExtraMargin);
                 marginSetter = new Setter()
                 {
-                    Property = Border.MarginProperty,
+                    Property = FrameworkElement.MarginProperty,
                     Value = margin,
                 };
                 windowBorderStyle.Setters.Add(marginSetter);
@@ -508,12 +510,12 @@ public void RemoveDropShadowEffectFromCurrentTheme()
             var dict = GetCurrentResourceDictionary();
             var windowBorderStyle = dict["WindowBorderStyle"] as Style;
 
-            if (windowBorderStyle.Setters.FirstOrDefault(setterBase => setterBase is Setter setter && setter.Property == Border.EffectProperty) is Setter effectSetter)
+            if (windowBorderStyle.Setters.FirstOrDefault(setterBase => setterBase is Setter setter && setter.Property == UIElement.EffectProperty) is Setter effectSetter)
             {
                 windowBorderStyle.Setters.Remove(effectSetter);
             }
 
-            if (windowBorderStyle.Setters.FirstOrDefault(setterBase => setterBase is Setter setter && setter.Property == Border.MarginProperty) is Setter marginSetter)
+            if (windowBorderStyle.Setters.FirstOrDefault(setterBase => setterBase is Setter setter && setter.Property == FrameworkElement.MarginProperty) is Setter marginSetter)
             {
                 var currentMargin = (Thickness)marginSetter.Value;
                 var newMargin = new Thickness(
@@ -529,28 +531,41 @@ public void RemoveDropShadowEffectFromCurrentTheme()
             UpdateResourceDictionary(dict);
         }
 
+        public void SetResizeBorderThickness(WindowChrome windowChrome, bool fixedWindowSize)
+        {
+            if (fixedWindowSize)
+            {
+                windowChrome.ResizeBorderThickness = new Thickness(0);
+            }
+            else
+            {
+                windowChrome.ResizeBorderThickness = _themeResizeBorderThickness;
+            }
+        }
+
         // because adding drop shadow effect will change the margin of the window,
         // we need to update the window chrome thickness to correct set the resize border
-        private static void SetResizeBoarderThickness(Thickness? effectMargin)
+        private void SetResizeBoarderThickness(Thickness? effectMargin)
         {
             var window = Application.Current.MainWindow;
             if (WindowChrome.GetWindowChrome(window) is WindowChrome windowChrome)
             {
-                Thickness thickness;
+                // Save the theme resize border thickness so that we can restore it if we change ResizeWindow setting
                 if (effectMargin == null)
                 {
-                    thickness = SystemParameters.WindowResizeBorderThickness;
+                    _themeResizeBorderThickness = SystemParameters.WindowResizeBorderThickness;
                 }
                 else
                 {
-                    thickness = new Thickness(
+                    _themeResizeBorderThickness = new Thickness(
                         effectMargin.Value.Left + SystemParameters.WindowResizeBorderThickness.Left,
                         effectMargin.Value.Top + SystemParameters.WindowResizeBorderThickness.Top,
                         effectMargin.Value.Right + SystemParameters.WindowResizeBorderThickness.Right,
                         effectMargin.Value.Bottom + SystemParameters.WindowResizeBorderThickness.Bottom);
                 }
 
-                windowChrome.ResizeBorderThickness = thickness;
+                // Apply the resize border thickness to the window chrome
+                SetResizeBorderThickness(windowChrome, _settings.KeepMaxResults);
             }
         }
 
@@ -582,7 +597,7 @@ await Application.Current.Dispatcher.InvokeAsync(() =>
                 {
                     AutoDropShadow(useDropShadowEffect);
                 }
-            }, DispatcherPriority.Normal);
+            }, DispatcherPriority.Render);
         }
 
         /// <summary>
@@ -596,7 +611,7 @@ await Application.Current.Dispatcher.InvokeAsync(() =>
                 var (backdropType, _) = GetActualValue();
 
                 SetBlurForWindow(GetCurrentTheme(), backdropType);
-            }, DispatcherPriority.Normal);
+            }, DispatcherPriority.Render);
         }
 
         /// <summary>

Flow.Launcher.Core/Resource/ThemeManager.cs

@@ -68,11 +68,12 @@ public string Theme
             get => _theme;
             set
             {
-                if (value == _theme)
-                    return;
-                _theme = value;
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(MaxResultsToShow));
+                if (value != _theme)
+                {
+                    _theme = value;
+                    OnPropertyChanged();
+                    OnPropertyChanged(nameof(MaxResultsToShow));
+                }
             }
         }
         public bool UseDropShadowEffect { get; set; } = true;
@@ -113,6 +114,33 @@ public string Theme
         public double? SettingWindowLeft { get; set; } = null;
         public System.Windows.WindowState SettingWindowState { get; set; } = WindowState.Normal;
 
+        bool _showPlaceholder { get; set; } = false;
+        public bool ShowPlaceholder
+        {
+            get => _showPlaceholder;
+            set
+            {
+                if (_showPlaceholder != value)
+                {
+                    _showPlaceholder = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+        string _placeholderText { get; set; } = string.Empty;
+        public string PlaceholderText
+        {
+            get => _placeholderText;
+            set
+            {
+                if (_placeholderText != value)
+                {
+                    _placeholderText = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
         public int CustomExplorerIndex { get; set; } = 0;
 
         [JsonIgnore]
@@ -241,10 +269,26 @@ public SearchPrecisionScore QuerySearchPrecision
         /// </summary>
         public double CustomWindowTop { get; set; } = 0;
 
-        public bool KeepMaxResults { get; set; } = false;
+        /// <summary>
+        /// Fixed window size
+        /// </summary>
+        private bool _keepMaxResults { get; set; } = false;
+        public bool KeepMaxResults
+        {
+            get => _keepMaxResults;
+            set
+            {
+                if (_keepMaxResults != value)
+                {
+                    _keepMaxResults = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
         public int MaxResultsToShow { get; set; } = 5;
-        public int ActivateTimes { get; set; }
 
+        public int ActivateTimes { get; set; }
 
         public ObservableCollection<CustomPluginHotkey> CustomPluginHotkeys { get; set; } = new ObservableCollection<CustomPluginHotkey>();
 

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -177,7 +177,6 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
                 HotKeyMapper.Initialize();
 
                 // main windows needs initialized before theme change because of blur settings
-                // TODO: Clean ThemeManager.Instance in future
                 Ioc.Default.GetRequiredService<Theme>().ChangeTheme();
 
                 Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);

Flow.Launcher/App.xaml.cs

@@ -39,7 +39,7 @@
     <system:String x:Key="GameMode">Game Mode</system:String>
     <system:String x:Key="GameModeToolTip">Suspend the use of Hotkeys.</system:String>
     <system:String x:Key="PositionReset">Position Reset</system:String>
-    <system:String x:Key="PositionResetToolTip">Reset search window position</system:String>
+    <system:String x:Key="queryTextBoxPlaceholder">Type here to search</system:String>
 
     <!--  Setting General  -->
     <system:String x:Key="flowlauncher_settings">Settings</system:String>
@@ -72,8 +72,6 @@
     <system:String x:Key="LastQueryEmpty">Empty last Query</system:String>
     <system:String x:Key="LastQueryActionKeywordPreserved">Preserve Last Action Keyword</system:String>
     <system:String x:Key="LastQueryActionKeywordSelected">Select Last Action Keyword</system:String>
-    <system:String x:Key="KeepMaxResults">Fixed Window Height</system:String>
-    <system:String x:Key="KeepMaxResultsToolTip">The window height is not adjustable by dragging.</system:String>
     <system:String x:Key="maxShowResults">Maximum results shown</system:String>
     <system:String x:Key="maxShowResultsToolTip">You can also quickly adjust this by using CTRL+Plus and CTRL+Minus.</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreen">Ignore hotkeys in fullscreen mode</system:String>
@@ -104,11 +102,6 @@
     <system:String x:Key="AlwaysPreview">Always Preview</system:String>
     <system:String x:Key="AlwaysPreviewToolTip">Always open preview panel when Flow activates. Press {0} to toggle preview.</system:String>
     <system:String x:Key="shadowEffectNotAllowed">Shadow effect is not allowed while current theme has blur effect enabled</system:String>
-    <system:String x:Key="BackdropType">Backdrop Type</system:String>
-    <system:String x:Key="BackdropTypesNone">None</system:String>
-    <system:String x:Key="BackdropTypesAcrylic">Acrylic</system:String>
-    <system:String x:Key="BackdropTypesMica">Mica</system:String>
-    <system:String x:Key="BackdropTypesMicaAlt">Mica Alt</system:String>
 
     <!--  Setting Plugin  -->
     <system:String x:Key="searchplugin">Search Plugin</system:String>
@@ -200,8 +193,19 @@
     <system:String x:Key="AnimationSpeedCustom">Custom</system:String>
     <system:String x:Key="Clock">Clock</system:String>
     <system:String x:Key="Date">Date</system:String>
+    <system:String x:Key="BackdropType">Backdrop Type</system:String>
+    <system:String x:Key="BackdropTypesNone">None</system:String>
+    <system:String x:Key="BackdropTypesAcrylic">Acrylic</system:String>
+    <system:String x:Key="BackdropTypesMica">Mica</system:String>
+    <system:String x:Key="BackdropTypesMicaAlt">Mica Alt</system:String>
     <system:String x:Key="TypeIsDarkToolTip">This theme supports two(light/dark) modes.</system:String>
     <system:String x:Key="TypeHasBlurToolTip">This theme supports Blur Transparent Background.</system:String>
+    <system:String x:Key="ShowPlaceholder">Show placeholder</system:String>
+    <system:String x:Key="ShowPlaceholderTip">Display placeholder when query is empty</system:String>
+    <system:String x:Key="PlaceholderText">Placeholder text</system:String>
+    <system:String x:Key="PlaceholderTextTip">Change placeholder text. Input empty will use: {0}</system:String>
+    <system:String x:Key="KeepMaxResults">Fixed Window Size</system:String>
+    <system:String x:Key="KeepMaxResultsToolTip">The window size is not adjustable by dragging.</system:String>
 
     <!--  Setting Hotkey  -->
     <system:String x:Key="hotkey">Hotkey</system:String>

Flow.Launcher/Languages/en.xaml

@@ -218,6 +218,14 @@
             <Grid x:Name="QueryBoxArea">
                 <Border MinHeight="30" Style="{DynamicResource QueryBoxBgStyle}">
                     <Grid>
+                        <TextBox
+                            x:Name="QueryTextPlaceholderBox"
+                            Height="{Binding MainWindowHeight, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                            FontSize="{Binding QueryBoxFontSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                            IsEnabled="False"
+                            Style="{DynamicResource QuerySuggestionBoxStyle}"
+                            Text="{Binding PlaceholderText, Mode=OneWay}"
+                            Visibility="Collapsed" />
                         <TextBox
                             x:Name="QueryTextSuggestionBox"
                             Height="{Binding MainWindowHeight, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"