mirror of
https://github.com/Flow-Launcher/Flow.Launcher.git
synced 2026-03-11 08:54:32 +00:00
Merge pull request #3541 from Flow-Launcher/topmost
Support Showing Search Window At Topmost
This commit is contained in:
commit
c4402c6fc8
4 changed files with 49 additions and 8 deletions
|
|
@ -59,8 +59,11 @@ namespace Flow.Launcher.Infrastructure.UserSettings
|
|||
get => _language;
|
||||
set
|
||||
{
|
||||
_language = value;
|
||||
OnPropertyChanged();
|
||||
if (_language != value)
|
||||
{
|
||||
_language = value;
|
||||
OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
private string _theme = Constant.DefaultTheme;
|
||||
|
|
@ -69,7 +72,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings
|
|||
get => _theme;
|
||||
set
|
||||
{
|
||||
if (value != _theme)
|
||||
if (_theme != value)
|
||||
{
|
||||
_theme = value;
|
||||
OnPropertyChanged();
|
||||
|
|
@ -298,9 +301,12 @@ namespace Flow.Launcher.Infrastructure.UserSettings
|
|||
get => _querySearchPrecision;
|
||||
set
|
||||
{
|
||||
_querySearchPrecision = value;
|
||||
if (_stringMatcher != null)
|
||||
_stringMatcher.UserSettingSearchPrecision = value;
|
||||
if (_querySearchPrecision != value)
|
||||
{
|
||||
_querySearchPrecision = value;
|
||||
if (_stringMatcher != null)
|
||||
_stringMatcher.UserSettingSearchPrecision = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -367,13 +373,30 @@ namespace Flow.Launcher.Infrastructure.UserSettings
|
|||
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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -84,6 +84,8 @@ namespace Flow.Launcher
|
|||
_viewModel = Ioc.Default.GetRequiredService<MainViewModel>();
|
||||
DataContext = _viewModel;
|
||||
|
||||
Topmost = _settings.ShowAtTopmost;
|
||||
|
||||
InitializeComponent();
|
||||
UpdatePosition();
|
||||
|
||||
|
|
@ -311,6 +313,9 @@ namespace Flow.Launcher
|
|||
_viewModel.QueryResults();
|
||||
}
|
||||
break;
|
||||
case nameof(Settings.ShowAtTopmost):
|
||||
Topmost = _settings.ShowAtTopmost;
|
||||
break;
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -77,6 +77,17 @@
|
|||
OnContent="{DynamicResource enable}" />
|
||||
</cc:Card>
|
||||
|
||||
<cc:Card
|
||||
Title="{DynamicResource showAtTopmost}"
|
||||
Margin="0 14 0 0"
|
||||
Icon=""
|
||||
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="">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
|
|
|
|||
Loading…
Reference in a new issue