Skip to content

Commit a0987c2

Browse files
committed
Revert "Stop updating AutoSuggestBox on selection" (#17989)
Reverts #17961 Closes #17987 Reopens #17916 (cherry picked from commit b715008) Service-Card-Id: PVTI_lADOAF3p4s4AmhmQzgTiWbQ Service-Version: 1.22
1 parent 24475ac commit a0987c2

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

src/cascadia/TerminalSettingsEditor/Appearances.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1030,9 +1030,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
10301030
}
10311031
}
10321032

1033-
void Appearances::FontFaceBox_QuerySubmitted(const AutoSuggestBox& sender, const AutoSuggestBoxQuerySubmittedEventArgs& args)
1033+
void Appearances::FontFaceBox_SuggestionChosen(const AutoSuggestBox& sender, const AutoSuggestBoxSuggestionChosenEventArgs& args)
10341034
{
1035-
const auto font = unbox_value<Editor::Font>(args.ChosenSuggestion());
1035+
const auto font = unbox_value<Editor::Font>(args.SelectedItem());
10361036
const auto fontName = font.Name();
10371037
auto fontSpec = sender.Text();
10381038

src/cascadia/TerminalSettingsEditor/Appearances.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
179179

180180
void FontFaceBox_GotFocus(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& e);
181181
void FontFaceBox_LostFocus(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& e);
182-
void FontFaceBox_QuerySubmitted(const winrt::Windows::UI::Xaml::Controls::AutoSuggestBox&, const winrt::Windows::UI::Xaml::Controls::AutoSuggestBoxQuerySubmittedEventArgs&);
182+
void FontFaceBox_SuggestionChosen(const winrt::Windows::UI::Xaml::Controls::AutoSuggestBox&, const winrt::Windows::UI::Xaml::Controls::AutoSuggestBoxSuggestionChosenEventArgs&);
183183
void FontFaceBox_TextChanged(const winrt::Windows::UI::Xaml::Controls::AutoSuggestBox&, const winrt::Windows::UI::Xaml::Controls::AutoSuggestBoxTextChangedEventArgs&);
184184
void DeleteFontKeyValuePair_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& e);
185185
safe_void_coroutine BackgroundImage_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& e);

src/cascadia/TerminalSettingsEditor/Appearances.xaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -214,11 +214,10 @@
214214
ItemTemplate="{StaticResource FontFaceComboBoxItemTemplate}"
215215
ItemsSource="{x:Bind FilteredFontList, Mode=OneWay}"
216216
LostFocus="FontFaceBox_LostFocus"
217-
QuerySubmitted="FontFaceBox_QuerySubmitted"
217+
SuggestionChosen="FontFaceBox_SuggestionChosen"
218218
Text="{x:Bind Appearance.FontFace, Mode=OneWay}"
219219
TextBoxStyle="{StaticResource TextBoxSettingStyle}"
220-
TextChanged="FontFaceBox_TextChanged"
221-
UpdateTextOnSelect="False" />
220+
TextChanged="FontFaceBox_TextChanged" />
222221
<CheckBox x:Name="ShowAllFontsCheckbox"
223222
x:Uid="Profile_FontFaceShowAllFonts"
224223
IsChecked="{x:Bind ShowAllFonts, Mode=TwoWay}" />

0 commit comments

Comments
 (0)