Merge branch 'dev' into double-pin

Author: VictoriousRaptor

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -59,8 +59,11 @@ public string Language
             get => _language;
             set
             {
-                _language = value;
-                OnPropertyChanged();
+                if (_language != value)
+                {
+                    _language = value;
+                    OnPropertyChanged();
+                }
             }
         }
         private string _theme = Constant.DefaultTheme;
@@ -69,7 +72,7 @@ public string Theme
             get => _theme;
             set
             {
-                if (value != _theme)
+                if (_theme != value)
                 {
                     _theme = value;
                     OnPropertyChanged();
@@ -300,9 +303,12 @@ public SearchPrecisionScore QuerySearchPrecision
             get => _querySearchPrecision;
             set
             {
-                _querySearchPrecision = value;
-                if (_stringMatcher != null)
-                    _stringMatcher.UserSettingSearchPrecision = value;
+                if (_querySearchPrecision != value)
+                {
+                    _querySearchPrecision = value;
+                    if (_stringMatcher != null)
+                        _stringMatcher.UserSettingSearchPrecision = value;
+                }
             }
         }
 
@@ -369,13 +375,30 @@ public bool HideNotifyIcon
             get => _hideNotifyIcon;
             set
             {
-                _hideNotifyIcon = value;
-                OnPropertyChanged();
+                if (_hideNotifyIcon != value)
+                {
+                    _hideNotifyIcon = value;
+                    OnPropertyChanged();
+                }
             }
         }
         public bool LeaveCmdOpen { get; set; }
         public bool HideWhenDeactivated { get; set; } = true;
 
+        private bool _showAtTopmost = true;
+        public bool ShowAtTopmost
+        {
+            get => _showAtTopmost;
+            set
+            {
+                if (_showAtTopmost != value)
+                {
+                    _showAtTopmost = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
         public bool SearchQueryResultsWithDelay { get; set; }
         public int SearchDelayTime { get; set; } = 150;
 

Flow.Launcher/Languages/en.xaml

@@ -131,6 +131,8 @@
     <system:String x:Key="historyResultsForHomePage">Show History Results in Home Page</system:String>
     <system:String x:Key="historyResultsCountForHomePage">Maximum History Results Shown in Home Page</system:String>
     <system:String x:Key="homeToggleBoxToolTip">This can only be edited if plugin supports Home feature and Home Page is enabled.</system:String>
+    <system:String x:Key="showAtTopmost">Show Search Window at Topmost</system:String>
+    <system:String x:Key="showAtTopmostToolTip">Show search window above other windows</system:String>
 
     <!--  Setting Plugin  -->
     <system:String x:Key="searchplugin">Search Plugin</system:String>

Flow.Launcher/MainWindow.xaml.cs

@@ -84,6 +84,8 @@ public MainWindow()
             _viewModel = Ioc.Default.GetRequiredService<MainViewModel>();
             DataContext = _viewModel;
 
+            Topmost = _settings.ShowAtTopmost;
+
             InitializeComponent();
             UpdatePosition();
 
@@ -311,6 +313,9 @@ private void OnLoaded(object sender, RoutedEventArgs _)
                             _viewModel.QueryResults();
                         }
                         break;
+                    case nameof(Settings.ShowAtTopmost):
+                        Topmost = _settings.ShowAtTopmost;
+                        break;
                 }
             };
 

Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml

@@ -36,7 +36,8 @@
                 Text="{DynamicResource actionKeywords}" />
             <!--  Here Margin="0 -4.5 0 -4.5" is to remove redundant top bottom margin from Margin="{StaticResource SettingPanelMargin}"  -->
             <Button
-                Width="100"
+                Width="auto"
+                MinWidth="100"
                 Margin="0 -4.5 0 -4.5"
                 HorizontalAlignment="Right"
                 Command="{Binding SetActionKeywordsCommand}"

Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml

@@ -77,6 +77,17 @@
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
+            <cc:Card
+                Title="{DynamicResource showAtTopmost}"
+                Margin="0 14 0 0"
+                Icon="&#xE923;"
+                Sub="{DynamicResource showAtTopmostToolTip}">
+                <ui:ToggleSwitch
+                    IsOn="{Binding Settings.ShowAtTopmost}"
+                    OffContent="{DynamicResource disable}"
+                    OnContent="{DynamicResource enable}" />
+            </cc:Card>
+
             <cc:CardGroup Margin="0 14 0 0">
                 <cc:Card Title="{DynamicResource SearchWindowPosition}" Icon="&#xe7f4;">
                     <StackPanel Orientation="Horizontal">