fix selected item

part of #412
This commit is contained in:
bao-qian
2016-05-06 03:24:14 +01:00
parent fe5bb1d885
commit 407f58da54
6 changed files with 81 additions and 122 deletions

View File

@@ -167,30 +167,33 @@ namespace Wox.ViewModel
Process.Start("http://doc.getwox.com");
});
OpenResultCommand = new RelayCommand(o =>
OpenResultCommand = new RelayCommand(index =>
{
var results = ContextMenuVisibility.IsVisible() ? ContextMenu : Results;
if (o != null)
if (index != null)
{
var index = int.Parse(o.ToString());
results.SelectResult(index);
results.SelectedIndex = int.Parse(index.ToString());
}
var result = results.SelectedResult.RawResult;
bool hideWindow = result.Action(new ActionContext
var result = results.SelectedItem?.RawResult;
if (result != null) // SelectedItem returns null if selection is empty.
{
SpecialKeyState = GlobalHotkey.Instance.CheckModifiers()
});
if (hideWindow)
{
MainWindowVisibility = Visibility.Collapsed;
}
bool hideWindow = result.Action(new ActionContext
{
SpecialKeyState = GlobalHotkey.Instance.CheckModifiers()
});
if (!ContextMenuVisibility.IsVisible())
{
_userSelectedRecord.Add(result);
_queryHistory.Add(result.OriginQuery.RawQuery);
if (hideWindow)
{
MainWindowVisibility = Visibility.Collapsed;
}
if (!ContextMenuVisibility.IsVisible())
{
_userSelectedRecord.Add(result);
_queryHistory.Add(result.OriginQuery.RawQuery);
}
}
});
@@ -198,19 +201,23 @@ namespace Wox.ViewModel
{
if (!ContextMenuVisibility.IsVisible())
{
var result = Results.SelectedResult.RawResult;
var id = result.PluginID;
var result = Results.SelectedItem?.RawResult;
var menus = PluginManager.GetContextMenusForPlugin(result);
menus.Add(ContextMenuTopMost(result));
menus.Add(ContextMenuPluginInfo(id));
ContextMenu.Clear();
Task.Run(() =>
if (result != null) // SelectedItem returns null if selection is empty.
{
ContextMenu.AddResults(menus, id);
}, _updateToken);
ContextMenuVisibility = Visibility.Visible;
var id = result.PluginID;
var menus = PluginManager.GetContextMenusForPlugin(result);
menus.Add(ContextMenuTopMost(result));
menus.Add(ContextMenuPluginInfo(id));
ContextMenu.Clear();
Task.Run(() =>
{
ContextMenu.AddResults(menus, id);
}, _updateToken);
ContextMenuVisibility = Visibility.Visible;
}
}
else
{