mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-12-12 18:29:24 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fixed process executing on clicking enter if no text in search box

Browse Source
This commit is contained in:
Divyansh Srivastava 2020-04-23 13:57:26 -07:00
parent 65cda38cc8
commit d0822ab1fe
2 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/modules/launcher/Wox/ViewModel/MainViewModel.cs
View File

@ -152,35 +152,38 @@ namespace Wox.ViewModel
results.SelectedIndex = int.Parse(index.ToString());
}
//If there is a context button selected fire the action for that button before the main command.
bool didExecuteContextButton = results.SelectedItem?.ExecuteSelectedContextButton() ?? false;
if (!didExecuteContextButton)
if(results.SelectedItem != null)
{
var result = results.SelectedItem?.Result;
if (result != null) // SelectedItem returns null if selection is empty.
{
bool hideWindow = result.Action != null && result.Action(new ActionContext
{
SpecialKeyState = GlobalHotkey.Instance.CheckModifiers()
});
if (hideWindow)
{
MainWindowVisibility = Visibility.Collapsed;
}
if (SelectedIsFromQueryResults())
{
_userSelectedRecord.Add(result);
_history.Add(result.OriginQuery.RawQuery);
}
else
{
SelectedResults = Results;
}
}
}
//If there is a context button selected fire the action for that button before the main command.
bool didExecuteContextButton = results.SelectedItem?.ExecuteSelectedContextButton() ?? false;
if (!didExecuteContextButton)
{
var result = results.SelectedItem?.Result;
if (result != null) // SelectedItem returns null if selection is empty.
{
bool hideWindow = result.Action != null && result.Action(new ActionContext
{
SpecialKeyState = GlobalHotkey.Instance.CheckModifiers()
});
if (hideWindow)
{
MainWindowVisibility = Visibility.Collapsed;
}
if (SelectedIsFromQueryResults())
{
_userSelectedRecord.Add(result);
_history.Add(result.OriginQuery.RawQuery);
}
else
{
SelectedResults = Results;
}
}
}
}
});
LoadContextMenuCommand = new RelayCommand(_ =>
@ -419,7 +422,8 @@ namespace Wox.ViewModel
}
else
{
Results.Clear();
Results.SelectedItem = null;
Results.Clear();
Results.Visbility = Visibility.Collapsed;
}
}

4
src/modules/launcher/Wox/ViewModel/ResultsViewModel.cs
View File

@ -65,6 +65,10 @@ namespace Wox.ViewModel
_selectedItem = value;
_selectedItem.ActivateContextButtons(ResultViewModel.ActivationType.Selection);
}
else
{
_selectedItem = value;
}
}
}