prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'FixEmptyQuery' of https://github.com/onesounds/Flow.Launcher into FixEmptyQuery

Browse source
This commit is contained in:
Dobin Park 2021-10-14 02:59:53 +09:00
commit 60064ea78b
2 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Flow.Launcher/Helper/HotKeyMapper.cs
View file

@ -60,7 +60,6 @@ namespace Flow.Launcher.Helper
if (!ShouldIgnoreHotkeys())
{
UpdateLastQUeryMode();
mainViewModel.ToggleFlowLauncherOpacity();
var overlayTask = Task.Delay(30).ContinueWith(_ => {
mainViewModel.ToggleFlowLauncher();
});

43
Flow.Launcher/ViewModel/MainViewModel.cs
View file

@ -50,6 +50,8 @@ namespace Flow.Launcher.ViewModel
private ChannelWriter<ResultsForUpdate> _resultsUpdateChannelWriter;
private Task _resultsViewUpdateTask;
#endregion
#region Constructor
@ -145,6 +147,24 @@ namespace Flow.Launcher.ViewModel
}
}
private void UpdateLastQUeryMode()
{
switch (_settings.LastQueryMode)
{
case LastQueryMode.Empty:
ChangeQueryText(string.Empty);
break;
case LastQueryMode.Preserved:
LastQuerySelected = true;
break;
case LastQueryMode.Selected:
LastQuerySelected = false;
break;
default:
throw new ArgumentException($"wrong LastQueryMode: <{_settings.LastQueryMode}>");
}
}
private void InitializeKeyCommands()
{
@ -156,15 +176,10 @@ namespace Flow.Launcher.ViewModel
}
else
{
Application.Current.MainWindow.Opacity = 0;
UpdateLastQUeryMode();
var overlayTask = Task.Delay(30).ContinueWith(_ => {
MainWindowVisibility = Visibility.Collapsed;
});
}
});
@ -672,30 +687,14 @@ namespace Flow.Launcher.ViewModel
{
if (MainWindowVisibility != Visibility.Visible)
{
MainWindowVisibility = Visibility.Visible;
}
else
{
MainWindowVisibility = Visibility.Collapsed;
}
}
internal void ToggleFlowLauncherOpacity()
{
if (MainWindowVisibility != Visibility.Visible)
{
Application.Current.MainWindow.Opacity = 1;
}
else
{
Application.Current.MainWindow.Opacity = 0;
}
}
#endregion
#region Public Methods