Skip to content

Commit 2ba6ce9

Browse files
committed
use ResultViewModel to hold constructed suggestion text instead
1 parent 0fe8c93 commit 2ba6ce9

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

Flow.Launcher/Converters/QuerySuggestionBoxConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
4646
// construct autocomplete with suggestion
4747
string _suggestion = queryText + selectedResultPossibleSuggestion.Substring(queryText.Length);
4848
if (string.IsNullOrEmpty(selectedResult.AutoCompleteText))
49-
selectedItem.Result.AutoCompleteText = _suggestion;
49+
selectedItem.QuerySuggestionText = _suggestion;
5050

5151
// When user typed lower case and result title is uppercase, we still want to display suggestion
5252
return queryText + selectedResultPossibleSuggestion.Substring(queryText.Length);

Flow.Launcher/ViewModel/MainViewModel.cs

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,14 +233,24 @@ private void InitializeKeyCommands()
233233
var result = SelectedResults.SelectedItem?.Result;
234234
if (result != null) // SelectedItem returns null if selection is empty.
235235
{
236-
string _newText = String.IsNullOrEmpty(result.AutoCompleteText) ? result.Title : result.AutoCompleteText;
236+
var autoCompleteText = result.Title;
237+
238+
if (!string.IsNullOrEmpty(result.AutoCompleteText))
239+
{
240+
autoCompleteText = result.AutoCompleteText;
241+
}
242+
else if (!string.IsNullOrEmpty(SelectedResults.SelectedItem?.QuerySuggestionText))
243+
{
244+
autoCompleteText = SelectedResults.SelectedItem.QuerySuggestionText;
245+
}
237246

238247
var SpecialKeyState = GlobalHotkey.Instance.CheckModifiers();
239248
if (SpecialKeyState.ShiftPressed)
240249
{
241-
_newText = result.SubTitle;
250+
autoCompleteText = result.SubTitle;
242251
}
243-
ChangeQueryText(_newText);
252+
253+
ChangeQueryText(autoCompleteText);
244254
}
245255
});
246256

Flow.Launcher/ViewModel/ResultViewModel.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ private async ValueTask LoadImageAsync()
142142

143143
public Result Result { get; }
144144

145+
public string QuerySuggestionText { get; set; }
146+
145147
public override bool Equals(object obj)
146148
{
147149
return obj is ResultViewModel r && Result.Equals(r.Result);

0 commit comments

Comments
 (0)