Skip to content

Commit f949287

Browse files
authored
Use shared ComboBoxesViewModel (#3666)
1 parent ab65856 commit f949287

File tree

5 files changed

+13
-63
lines changed

5 files changed

+13
-63
lines changed

src/MainDemo.Wpf/ComboBoxes.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using MaterialDesignDemo.Domain;
1+
using MaterialDesignDemo.Shared.Domain;
22
using Screen = System.Windows.Forms.Screen;
33
using DrawingPoint = System.Drawing.Point;
44

src/MaterialDesign3.Demo.Wpf/ComboBoxes.xaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
<smtx:XamlDisplay Margin="0" UniqueKey="comboboxes_5">
130130
<ComboBox MinWidth="72"
131131
materialDesign:HintAssist.Hint="Virtualisation"
132-
ItemsSource="{Binding LongListToTestComboVirtualization}"
132+
ItemsSource="{Binding LongIntegerList}"
133133
SelectedValue="{Binding SelectedValueOne}">
134134

135135
<ComboBox.SelectedItem>
@@ -155,7 +155,7 @@
155155
<ComboBox MinWidth="72"
156156
materialDesign:HintAssist.Hint="(editable)"
157157
IsEditable="True"
158-
ItemsSource="{Binding LongListToTestComboVirtualization}">
158+
ItemsSource="{Binding LongIntegerList}">
159159
<ComboBox.Text>
160160
<Binding Mode="TwoWay"
161161
Path="SelectedTextTwo"
@@ -174,7 +174,7 @@
174174
</smtx:XamlDisplay>
175175
<smtx:XamlDisplay UniqueKey="comboboxes_7">
176176
<ComboBox materialDesign:HintAssist.Hint="(float hint)"
177-
ItemsSource="{Binding LongListToTestComboVirtualization}"
177+
ItemsSource="{Binding LongIntegerList}"
178178
Style="{StaticResource MaterialDesignFloatingHintComboBox}">
179179
<ComboBox.ItemsPanel>
180180
<ItemsPanelTemplate>
@@ -187,7 +187,7 @@
187187
<ComboBox MinWidth="72"
188188
materialDesign:HintAssist.FloatingScale="1.5"
189189
materialDesign:HintAssist.Hint="(large float hint)"
190-
ItemsSource="{Binding LongListToTestComboVirtualization}"
190+
ItemsSource="{Binding LongIntegerList}"
191191
Style="{StaticResource MaterialDesignFloatingHintComboBox}">
192192
<ComboBox.ItemsPanel>
193193
<ItemsPanelTemplate>
@@ -200,7 +200,7 @@
200200
<ComboBox MinWidth="72"
201201
materialDesign:HintAssist.FontFamily="Verdana"
202202
materialDesign:HintAssist.Hint="(Change fontfamily float hint)"
203-
ItemsSource="{Binding LongListToTestComboVirtualization}"
203+
ItemsSource="{Binding LongIntegerList}"
204204
Style="{StaticResource MaterialDesignFloatingHintComboBox}">
205205
<ComboBox.ItemsPanel>
206206
<ItemsPanelTemplate>

src/MaterialDesign3.Demo.Wpf/ComboBoxes.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using MaterialDesign3Demo.Domain;
1+
using MaterialDesignDemo.Shared.Domain;
22

33
namespace MaterialDesign3Demo;
44

src/MaterialDesign3.Demo.Wpf/Domain/ComboBoxesViewModel.cs

Lines changed: 0 additions & 50 deletions
This file was deleted.

src/MainDemo.Wpf/Domain/ComboBoxesViewModel.cs renamed to src/MaterialDesignDemo.Shared/Domain/ComboBoxesViewModel.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using MaterialDesignDemo.Shared.Domain;
1+
using System.IO;
22

3-
namespace MaterialDesignDemo.Domain;
3+
namespace MaterialDesignDemo.Shared.Domain;
44

55
public class ComboBoxesViewModel : ViewModelBase
66
{
@@ -12,17 +12,17 @@ public class ComboBoxesViewModel : ViewModelBase
1212
public ComboBoxesViewModel()
1313
{
1414
LongIntegerList = new List<int>(Enumerable.Range(0, 1000));
15-
ShortStringList = new[]
16-
{
15+
ShortStringList =
16+
[
1717
"Item 1",
1818
"Item 2",
1919
"Item 3"
20-
};
20+
];
2121

2222
SelectedValueOne = LongIntegerList.Skip(2).First();
2323
SelectedTextTwo = null;
2424

25-
LongStringList = new List<string>();
25+
LongStringList = [];
2626

2727
for (int i = 0; i < 1000; i++)
2828
{

0 commit comments

Comments
 (0)