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

fix #813

Browse Source
This commit is contained in:
bao-qian
2016-07-20 23:37:06 +01:00
parent 206532f195
commit 3b53527e9e
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Wox/MainWindow.xaml.cs
View File

@@ -235,7 +235,11 @@ namespace Wox
private void OnTextChanged(object sender, TextChangedEventArgs e) private void OnTextChanged(object sender, TextChangedEventArgs e)
{ {
QueryTextBox.CaretIndex = QueryTextBox.Text.Length; if (_viewModel.QueryTextCursorMovedToEnd)
{
QueryTextBox.CaretIndex = QueryTextBox.Text.Length;
_viewModel.QueryTextCursorMovedToEnd = false;
}
} }
} }
} }

4
Wox/PublicAPIInstance.cs
View File

@@ -36,12 +36,12 @@ namespace Wox
public void ChangeQuery(string query, bool requery = false) public void ChangeQuery(string query, bool requery = false)
{ {
_mainVM.QueryText = query; _mainVM.ChangeQueryText(query);
} }
public void ChangeQueryText(string query, bool selectAll = false) public void ChangeQueryText(string query, bool selectAll = false)
{ {
_mainVM.QueryText = query; _mainVM.ChangeQueryText(query);
} }
[Obsolete] [Obsolete]

18
Wox/ViewModel/MainViewModel.cs
View File

@@ -205,7 +205,19 @@ namespace Wox.ViewModel
Query(); Query();
} }
} }
/// <summary>
/// we need move cursor to end when we manually changed query
/// but we don't want to move cursor to end when query is updated from TextBox
/// </summary>
/// <param name="queryText"></param>
public void ChangeQueryText(string queryText)
{
QueryTextCursorMovedToEnd = true;
QueryText = queryText;
}
public bool QueryTextSelected { get; set; } public bool QueryTextSelected { get; set; }
public bool QueryTextCursorMovedToEnd { get; set; }
private ResultsViewModel _selectedResults; private ResultsViewModel _selectedResults;
private ResultsViewModel SelectedResults private ResultsViewModel SelectedResults
@@ -218,7 +230,7 @@ namespace Wox.ViewModel
{ {
ContextMenu.Visbility = Visibility.Collapsed; ContextMenu.Visbility = Visibility.Collapsed;
History.Visbility = Visibility.Collapsed; History.Visbility = Visibility.Collapsed;
QueryText = _queryTextBeforeLeaveResults; ChangeQueryText(_queryTextBeforeLeaveResults);
} }
else else
{ {
@@ -325,7 +337,7 @@ namespace Wox.ViewModel
Action = _ => Action = _ =>
{ {
SelectedResults = Results; SelectedResults = Results;
QueryText = h.Query; ChangeQueryText(h.Query);
return false; return false;
} }
}; };
@@ -547,7 +559,7 @@ namespace Wox.ViewModel
{ {
if (ShouldIgnoreHotkeys()) return; if (ShouldIgnoreHotkeys()) return;
MainWindowVisibility = Visibility.Visible; MainWindowVisibility = Visibility.Visible;
QueryText = hotkey.ActionKeyword; ChangeQueryText(hotkey.ActionKeyword);
}); });
} }
} }