Skip to content

Commit 6883d49

Browse files
committed
tidy up some demo code
1 parent e39043d commit 6883d49

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

MainDemo.Wpf/Pickers.xaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,13 @@
3535
</Binding>
3636
</DatePicker.SelectedDate>
3737
</DatePicker>
38-
<ComboBox Name="cboLocale" HorizontalAlignment="Left" Width="50" Margin="0 32 0 0"/>
38+
<ComboBox Name="LocaleCombo" HorizontalAlignment="Left" Width="50" Margin="0 32 0 0">
39+
<ComboBox.ItemsPanel>
40+
<ItemsPanelTemplate>
41+
<VirtualizingStackPanel />
42+
</ItemsPanelTemplate>
43+
</ComboBox.ItemsPanel>
44+
</ComboBox>
3945
<DatePicker Name="LocaleDatePicker" Width="120" HorizontalAlignment="Left" Margin="0 16 0 0" materialDesign:HintAssist.Hint="Locale Date" />
4046
<DatePicker Name="LocaleDatePickerRTL" Width="120" HorizontalAlignment="Left" Margin="0 16 0 0" materialDesign:HintAssist.Hint="RTL Locale Date" FlowDirection="RightToLeft" />
4147
</StackPanel>

MainDemo.Wpf/Pickers.xaml.cs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ public Pickers()
2727
InitializeComponent();
2828
FutureDatePicker.BlackoutDates.AddDatesInPast();
2929
LoadLocales();
30-
cboLocale.SelectionChanged += CboLocale_SelectionChanged;
31-
cboLocale.SelectedItem = "fr-CA";
30+
LocaleCombo.SelectionChanged += LocaleCombo_SelectionChanged;
31+
LocaleCombo.SelectedItem = "fr-CA";
3232
}
3333

34-
private void CboLocale_SelectionChanged(object sender, SelectionChangedEventArgs e)
34+
private void LocaleCombo_SelectionChanged(object sender, SelectionChangedEventArgs e)
3535
{
36-
var lang = System.Windows.Markup.XmlLanguage.GetLanguage(cboLocale.SelectedItem as string);
36+
var lang = System.Windows.Markup.XmlLanguage.GetLanguage((string)LocaleCombo.SelectedItem);
3737
LocaleDatePicker.Language = lang;
3838
LocaleDatePickerRTL.Language = lang;
3939

@@ -46,12 +46,11 @@ private void CboLocale_SelectionChanged(object sender, SelectionChangedEventArgs
4646

4747
private void LoadLocales()
4848
{
49-
foreach (CultureInfo ci in CultureInfo.GetCultures(CultureTypes.AllCultures).OrderBy(ci => ci.Name))
49+
foreach (var ci in CultureInfo.GetCultures(CultureTypes.AllCultures)
50+
.Where(ci => ci.Calendar is GregorianCalendar)
51+
.OrderBy(ci => ci.Name))
5052
{
51-
if (ci.Calendar is GregorianCalendar)
52-
{
53-
cboLocale.Items.Add(ci.Name);
54-
}
53+
LocaleCombo.Items.Add(ci.Name);
5554
}
5655
}
5756

0 commit comments

Comments
 (0)