Skip to content

Commit 70c08e6

Browse files
committed
improved serach flickering
1 parent 6e345f1 commit 70c08e6

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

Microsoft.Toolkit.Uwp.SampleApp/Controls/ExtendedHamburgerMenu.cs

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ public void HideSamplePicker()
8282
{
8383
_samplePickerGrid.Visibility = Visibility.Collapsed;
8484
}
85+
86+
var noop = SetHamburgerMenuSelection();
8587
}
8688

8789
public async void ShowSamplePicker(Sample[] samples = null)
@@ -110,6 +112,14 @@ public async void ShowSamplePicker(Sample[] samples = null)
110112
return;
111113
}
112114

115+
if (_samplePickerGrid.Visibility == Visibility.Visible &&
116+
_samplePickerGridView.ItemsSource is Sample[] currentSamples &&
117+
currentSamples.Count() == samples.Count() &&
118+
currentSamples.Except(samples).Count() == 0)
119+
{
120+
return;
121+
}
122+
113123
_samplePickerGridView.ItemsSource = samples;
114124

115125
if (_currentSample != null && samples.Contains(_currentSample))
@@ -311,11 +321,6 @@ private void SearchButton_GotFocus(object sender, RoutedEventArgs e)
311321

312322
private void SearchBox_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
313323
{
314-
if (args.Reason != AutoSuggestionBoxTextChangeReason.UserInput)
315-
{
316-
return;
317-
}
318-
319324
UpdateSearchSuggestions();
320325
}
321326

@@ -367,7 +372,14 @@ private void ExtendedHamburgerMenu_ItemClick(object sender, ItemClickEventArgs e
367372
{
368373
if (_samplePickerGrid.Visibility != Visibility.Collapsed && SelectedItem == e.ClickedItem)
369374
{
370-
HideSamplePicker();
375+
if (_hamburgerButton != null && _hamburgerButton.Visibility == Visibility.Visible)
376+
{
377+
HideItemsInNarrowView();
378+
}
379+
else
380+
{
381+
HideSamplePicker();
382+
}
371383
}
372384
else
373385
{
@@ -407,7 +419,6 @@ private async Task SetHamburgerMenuSelection()
407419
private void ContentShadow_Tapped(object sender, Windows.UI.Xaml.Input.TappedRoutedEventArgs e)
408420
{
409421
HideSamplePicker();
410-
var noop = SetHamburgerMenuSelection();
411422

412423
if (_hamburgerButton != null && _hamburgerButton.Visibility == Visibility.Visible)
413424
{

0 commit comments

Comments
 (0)