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

feat: new history logic in MainViewModel

Browse source
This commit is contained in:
01Dri 2025-10-08 21:15:10 -03:00
parent 06711d3b8b
commit c051c5cd50
2 changed files with 27 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Flow.Launcher.Infrastructure/UserSettings/Settings.cs
View file

@ -215,6 +215,28 @@ namespace Flow.Launcher.Infrastructure.UserSettings
}
}
}
private bool _showHistoryOnHomePage = true;
public bool ShowHistoryOnHomePage
{
get
{
if (ShowHistoryQueryResultsForHomePage || ShowHistoryLastOpenedResultsForHomePage) return true;
return _showHistoryOnHomePage;
}
set
{
if (_showHistoryOnHomePage != value)
{
_showHistoryOnHomePage = value;
OnPropertyChanged();
if (value == false)
{
ShowHistoryQueryResultsForHomePage = false;
ShowHistoryLastOpenedResultsForHomePage = false;
}
}
}
}
private bool _showHistoryQueryResultsForHomePage = false;
public bool ShowHistoryQueryResultsForHomePage

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

@ -536,7 +536,10 @@ namespace Flow.Launcher.ViewModel
if (QueryResultsSelected())
{
_history.AddToHistory(result, Settings);
if (Settings.ShowHistoryOnHomePage)
{
_history.AddToHistory(result, Settings);
}
_userSelectedRecord.Add(result);
lastHistoryIndex = 1;
}
@ -1320,38 +1323,8 @@ namespace Flow.Launcher.ViewModel
private List<Result> GetHistoryResults(IEnumerable<HistoryItem> historyItems)
{
var results = new List<Result>();
Func<ActionContext, bool> defaultAction = _ => false;
foreach (var h in historyItems)
{
// Achar uma forma melhor de fazer isso
if (Settings.ShowHistoryLastOpenedResultsForHomePage)
{
var pluginPair = PluginManager.GetPluginForId(h.PluginID);
if (pluginPair != null)
{
var queryResults = PluginManager
.QueryForPluginAsync(pluginPair, h.OriginQuery, CancellationToken.None)
.GetAwaiter()
.GetResult();
var originalResult = queryResults?.FirstOrDefault(r =>
r.Title == h.Title && r.SubTitle == h.SubTitle);
if (originalResult?.Action != null)
{
defaultAction = originalResult.Action;
}
}
}
else
{
defaultAction = _ =>
{
App.API.BackToQueryResults();
App.API.ChangeQuery(h.OriginQuery.RawQuery);
return false;
};
}
var timeT = App.API.GetTranslation("lastExecuteTime");
var result = new Result
{
@ -1360,7 +1333,7 @@ namespace Flow.Launcher.ViewModel
IcoPath = Constant.HistoryIcon,
PluginID = h.PluginID,
OriginQuery = h.OriginQuery,
Action = defaultAction,
Action = Settings.ShowHistoryLastOpenedResultsForHomePage ? h.ExecuteAction : h.QueryAction,
Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\uE81C")
};
results.Add(result);