Skip to content

Commit 250ff69

Browse files
committed
use ListView to host filter items
1 parent aa621b9 commit 250ff69

File tree

1 file changed

+26
-15
lines changed

1 file changed

+26
-15
lines changed

src/WinUI.TableView/Themes/TableViewColumnHeader.xaml

+26-15
Original file line numberDiff line numberDiff line change
@@ -170,24 +170,35 @@
170170
BorderThickness="0,0,0,1"
171171
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}">
172172
<CheckBox x:Name="SelectAllCheckBox"
173-
Margin="12,8,12,0"
173+
Margin="12,8,12,1"
174174
IsThreeState="True"
175175
Content="(Select All)" />
176176
</Border>
177-
<ScrollViewer Grid.Row="2"
178-
Padding="12,0"
179-
VerticalScrollMode="Enabled">
180-
<ItemsControl ItemsSource="{Binding FilterItems}">
181-
<ItemsControl.ItemTemplate>
182-
<DataTemplate>
183-
<CheckBox IsChecked="{Binding IsSelected, Mode=TwoWay}">
184-
<TextBlock Text="{Binding Value}"
185-
TextWrapping="NoWrap" />
186-
</CheckBox>
187-
</DataTemplate>
188-
</ItemsControl.ItemTemplate>
189-
</ItemsControl>
190-
</ScrollViewer>
177+
<ListView Grid.Row="2"
178+
SelectionMode="None"
179+
ItemsSource="{Binding FilterItems}">
180+
<ListView.ItemContainerStyle>
181+
<Style TargetType="ListViewItem"
182+
BasedOn="{StaticResource DefaultListViewItemStyle}">
183+
<Setter Property="Padding"
184+
Value="12,0" />
185+
<Setter Property="Margin"
186+
Value="0" />
187+
<Setter Property="MinHeight"
188+
Value="36" />
189+
<Setter Property="Height"
190+
Value="36" />
191+
</Style>
192+
</ListView.ItemContainerStyle>
193+
<ListView.ItemTemplate>
194+
<DataTemplate>
195+
<CheckBox IsChecked="{Binding IsSelected, Mode=TwoWay}">
196+
<TextBlock Text="{Binding Value}"
197+
TextWrapping="NoWrap" />
198+
</CheckBox>
199+
</DataTemplate>
200+
</ListView.ItemTemplate>
201+
</ListView>
191202
</Grid>
192203
</ControlTemplate>
193204
</MenuFlyoutItem.Template>

0 commit comments

Comments
 (0)