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 pull request #1 from AminSallah/reselect

Browse source 
Prevent reselect first result if needed
This commit is contained in:
AminSallah 2024-03-05 11:04:32 +00:00 committed by GitHub
commit 99ac5f010d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
View file

@ -293,9 +293,10 @@ namespace Flow.Launcher.Plugin
public bool IsGameModeOn();
/// <summary>
/// Reload Query
/// Reloads the query.
/// This method should run
/// </summary>
/// <returns></returns>
public void ReQuery();
/// <param name="reselect">Choose the first result after reload if true; keep the last selected result if false. Default is true.</param>
public void ReQuery(bool reselect = true);
}
}

2
Flow.Launcher/PublicAPIInstance.cs
View file

@ -315,7 +315,7 @@ namespace Flow.Launcher
public void RegisterGlobalKeyboardCallback(Func<int, int, SpecialKeyState, bool> callback) => _globalKeyboardHandlers.Add(callback);
public void RemoveGlobalKeyboardCallback(Func<int, int, SpecialKeyState, bool> callback) => _globalKeyboardHandlers.Remove(callback);
public void ReQuery() => _mainVM.ReQuery();
public void ReQuery(bool reselect = true) => _mainVM.ReQuery(reselect);
#endregion

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

@ -33,6 +33,7 @@ namespace Flow.Launcher.ViewModel
#region Private Fields
private bool _isQueryRunning;
private bool _reselect = true;
private Query _lastQuery;
private Result lastContextMenuResult = new Result();
private List<Result> lastContextMenuResults = new List<Result>();
@ -216,6 +217,15 @@ namespace Flow.Launcher.ViewModel
}
}
public void ReQuery(bool reselect)
{
if (SelectedIsFromQueryResults())
{
_reselect = reselect;
QueryResults(isReQuery: true);
}
}
[RelayCommand]
private void LoadContextMenu()
{
@ -1151,7 +1161,8 @@ namespace Flow.Launcher.ViewModel
}
}
Results.AddResults(resultsForUpdates, token);
Results.AddResults(resultsForUpdates, token, _reselect);
_reselect = true;
}
#endregion

8
Flow.Launcher/ViewModel/ResultsViewModel.cs
View file

@ -147,23 +147,23 @@ namespace Flow.Launcher.ViewModel
/// <summary>
/// To avoid deadlock, this method should not called from main thread
/// </summary>
public void AddResults(IEnumerable<ResultsForUpdate> resultsForUpdates, CancellationToken token)
public void AddResults(IEnumerable<ResultsForUpdate> resultsForUpdates, CancellationToken token, bool reselect = true)
{
var newResults = NewResults(resultsForUpdates);
if (token.IsCancellationRequested)
return;
UpdateResults(newResults, token);
UpdateResults(newResults, token, reselect);
}
private void UpdateResults(List<ResultViewModel> newResults, CancellationToken token = default)
private void UpdateResults(List<ResultViewModel> newResults, CancellationToken token = default, bool reselect = true)
{
lock (_collectionLock)
{
// update UI in one run, so it can avoid UI flickering
Results.Update(newResults, token);
if (Results.Any())
if (reselect && Results.Any())
SelectedItem = Results[0];
}