Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ public SettingsPaneThemeViewModel(Settings settings, Theme theme)
)
}
};
var vm = new ResultsViewModel(Settings);
var vm = new ResultsViewModel(Settings, null);
vm.AddResults(results, "PREVIEW");
PreviewResults = vm;
}
Expand Down
12 changes: 9 additions & 3 deletions Flow.Launcher/ViewModel/MainViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -148,19 +148,19 @@ public MainViewModel()
_userSelectedRecord = _userSelectedRecordStorage.Load();
_topMostRecord = _topMostRecordStorage.Load();

ContextMenu = new ResultsViewModel(Settings)
ContextMenu = new ResultsViewModel(Settings, this)
{
LeftClickResultCommand = OpenResultCommand,
RightClickResultCommand = LoadContextMenuCommand,
IsPreviewOn = Settings.AlwaysPreview
};
Results = new ResultsViewModel(Settings)
Results = new ResultsViewModel(Settings, this)
{
LeftClickResultCommand = OpenResultCommand,
RightClickResultCommand = LoadContextMenuCommand,
IsPreviewOn = Settings.AlwaysPreview
};
History = new ResultsViewModel(Settings)
History = new ResultsViewModel(Settings, this)
{
LeftClickResultCommand = OpenResultCommand,
RightClickResultCommand = LoadContextMenuCommand,
Expand Down Expand Up @@ -1662,6 +1662,12 @@ private bool HistorySelected()
return selected;
}

internal bool ResultsSelected(ResultsViewModel results)
{
var selected = SelectedResults == results;
return selected;
}

#endregion

#region Hotkey
Expand Down
16 changes: 13 additions & 3 deletions Flow.Launcher/ViewModel/ResultsViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public class ResultsViewModel : BaseModel

private readonly object _collectionLock = new();
private readonly Settings _settings;
private readonly MainViewModel _mainVM;
private int MaxResults => _settings?.MaxResultsToShow ?? 6;

public ResultsViewModel()
Expand All @@ -29,9 +30,10 @@ public ResultsViewModel()
BindingOperations.EnableCollectionSynchronization(Results, _collectionLock);
}

public ResultsViewModel(Settings settings) : this()
public ResultsViewModel(Settings settings, MainViewModel mainVM) : this()
{
_settings = settings;
_mainVM = mainVM;
_settings.PropertyChanged += (s, e) =>
{
switch (e.PropertyName)
Expand Down Expand Up @@ -179,6 +181,7 @@ public void AddResults(List<Result> newRawResults, string resultId)

UpdateResults(newResults);
}

/// <summary>
/// To avoid deadlock, this method should not called from main thread
/// </summary>
Expand All @@ -202,11 +205,18 @@ private void UpdateResults(List<ResultViewModel> newResults, bool reselect = tru
SelectedItem = Results[0];
}

if (token.IsCancellationRequested)
return;

switch (Visibility)
{
case Visibility.Collapsed when Results.Count > 0:
SelectedIndex = 0;
Visibility = Visibility.Visible;
// Show it only if the results are selected
if (_mainVM == null || _mainVM.ResultsSelected(this))
{
SelectedIndex = 0;
Visibility = Visibility.Visible;
}
break;
case Visibility.Visible when Results.Count == 0:
Visibility = Visibility.Collapsed;
Expand Down
Loading