Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-02-24 04:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #63 from jjw24/add_contextmenu_return_afterselection

Browse Source 
Add return to main query window from context menu after selection
This commit is contained in:
Jeremy Wu
2019-10-27 20:50:28 +11:00
committed by GitHub
parent 1cd9c57f87 99b5e3565d
commit cde7f2ab1c
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Wox/ViewModel/MainViewModel.cs
View File

@@ -96,7 +96,7 @@ namespace Wox.ViewModel
{
EscCommand = new RelayCommand(_ =>
{
if (!ResultsSelected())
if (!SelectedIsFromQueryResults())
{
SelectedResults = Results;
}
@@ -153,17 +153,21 @@ namespace Wox.ViewModel
MainWindowVisibility = Visibility.Collapsed;
}
if (ResultsSelected())
if (SelectedIsFromQueryResults())
{
_userSelectedRecord.Add(result);
_history.Add(result.OriginQuery.RawQuery);
}
else
{
SelectedResults = Results;
}
}
});
LoadContextMenuCommand = new RelayCommand(_ =>
{
if (ResultsSelected())
if (SelectedIsFromQueryResults())
{
SelectedResults = ContextMenu;
}
@@ -175,7 +179,7 @@ namespace Wox.ViewModel
LoadHistoryCommand = new RelayCommand(_ =>
{
if (ResultsSelected())
if (SelectedIsFromQueryResults())
{
SelectedResults = History;
History.SelectedIndex = _history.Items.Count - 1;
@@ -226,7 +230,7 @@ namespace Wox.ViewModel
set
{
_selectedResults = value;
if (ResultsSelected())
if (SelectedIsFromQueryResults())
{
ContextMenu.Visbility = Visibility.Collapsed;
History.Visbility = Visibility.Collapsed;
@@ -273,7 +277,7 @@ namespace Wox.ViewModel
public void Query()
{
if (ResultsSelected())
if (SelectedIsFromQueryResults())
{
QueryResults();
}
@@ -487,7 +491,7 @@ namespace Wox.ViewModel
return menu;
}
private bool ResultsSelected()
private bool SelectedIsFromQueryResults()
{
var selected = SelectedResults == Results;
return selected;