Skip to content

Commit

Permalink
ListViewItem/GridViewItem Visual Updates - Phase #1
Browse files Browse the repository at this point in the history
  • Loading branch information
@RBrid
RBrid committed Jan 14, 2021
1 parent 8620603 commit 3ef1988
Show file tree
Hide file tree
Showing 10 changed files with 1,448 additions and 6 deletions.
8 changes: 7 additions & 1 deletion dev/CommonStyles/CommonStyles.vcxitems
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,13 @@
<Type>ThemeResources</Type>
<UseNonstandardCondtionalXAML>true</UseNonstandardCondtionalXAML>
</Page>
<Page Include="$(MSBuildThisFileDirectory)ListViewItem_themeresources.xaml">
<Page Include="$(MSBuildThisFileDirectory)GridViewItem_themeresources_vu.xaml">
<UseVisualStyle>Latest</UseVisualStyle>
<Version>RS1</Version>
<Type>ThemeResources</Type>
<UseNonstandardCondtionalXAML>true</UseNonstandardCondtionalXAML>
</Page>
<Page Include="$(MSBuildThisFileDirectory)ListViewItem_themeresources_vu.xaml">
<UseVisualStyle>Latest</UseVisualStyle>
<Version>RS1</Version>
<Type>ThemeResources</Type>
Expand Down
252 changes: 252 additions & 0 deletions dev/CommonStyles/GridViewItem_themeresources_vu.xaml
View file

Large diffs are not rendered by default.

1,062 changes: 1,062 additions & 0 deletions dev/CommonStyles/ListViewItem_themeresources_vu.xaml
View file

Large diffs are not rendered by default.

75 changes: 75 additions & 0 deletions dev/CommonStyles/TestUI/CommonStylesPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,81 @@
<FontIcon Glyph="&#xE781;" />
</Button>
</StackPanel>
<StackPanel Style="{ThemeResource CompactPanelStyle}">
<TextBlock Text="ListViewItem/GridViewItem testing area" Style="{ThemeResource StandardGroupHeader}"/>
<StackPanel Orientation='Horizontal' Background="White">
<StackPanel>
<StackPanel Orientation='Horizontal'>
<TextBlock Text='ListView - SelectionMode=' VerticalAlignment='Center' Margin='2'/>
<ComboBox x:Name='cmbListViewSelectionMode' SelectedIndex='2' SelectionChanged="CmbListViewSelectionMode_SelectionChanged">
<ComboBoxItem>None</ComboBoxItem>
<ComboBoxItem>Single</ComboBoxItem>
<ComboBoxItem>Multiple</ComboBoxItem>
<ComboBoxItem>Extended</ComboBoxItem>
</ComboBox>
</StackPanel>
<CheckBox x:Name='chkListViewIsEnabled' Content='IsEnabled?' IsChecked='True' Margin='2' Checked="ChkListViewIsEnabled_Checked" Unchecked="ChkListViewIsEnabled_Unchecked"/>
<ListView x:Name='listView1' CanReorderItems='True' AllowDrop='True' SelectionMode='Multiple' Width='300' HorizontalAlignment='Left' Margin='2'>
<ListViewItem x:Name='listViewItem1' Content='List Item 1'/>
<ListViewItem x:Name='listViewItem2' Content='List Item 2'/>
<ListViewItem x:Name='listViewItem3' Content='List Item 3' IsSelected='true'/>
</ListView>
</StackPanel>
<StackPanel>
<StackPanel Orientation='Horizontal'>
<TextBlock Text='GridView - SelectionMode=' VerticalAlignment='Center' Margin='2'/>
<ComboBox x:Name='cmbGridViewSelectionMode' SelectedIndex='2' SelectionChanged="CmbGridViewSelectionMode_SelectionChanged">
<ComboBoxItem>None</ComboBoxItem>
<ComboBoxItem>Single</ComboBoxItem>
<ComboBoxItem>Multiple</ComboBoxItem>
<ComboBoxItem>Extended</ComboBoxItem>
</ComboBox>
</StackPanel>
<CheckBox x:Name='chkGridViewIsEnabled' Content='IsEnabled?' IsChecked='True' Margin='2' Checked="ChkGridViewIsEnabled_Checked" Unchecked="ChkGridViewIsEnabled_Unchecked"/>
<GridView x:Name='gridView1' CanReorderItems='True' AllowDrop='True' SelectionMode='Multiple' Width='300' HorizontalAlignment='Left' Margin='2'>
<GridViewItem x:Name='gridViewItem1' Content='Item 1' MinWidth='120' MinHeight='60'/>
<GridViewItem x:Name='gridViewItem2' Content='Item 2' MinWidth='120' MinHeight='60'/>
<GridViewItem x:Name='gridViewItem3' Content='Item 3' MinWidth='120' MinHeight='60' IsSelected='true'/>
</GridView>
</StackPanel>
</StackPanel>
<StackPanel Orientation='Horizontal' Background="White">
<StackPanel>
<TextBlock Text='ListView - SelectionMode=Extended:' Margin='2'/>
<ListView x:Name='listView2' CanReorderItems='True' AllowDrop='True' SelectionMode='Extended' Width='300' HorizontalAlignment='Left' Margin='2'>
<ListViewItem x:Name='listViewItem4' Content='List Item 4' Height='5'/>
<ListViewItem x:Name='listViewItem5' Content='List Item 5' Height='70'/>
<ListViewItem x:Name='listViewItem6' Content='List Item 6' Height='90' IsSelected='true'/>
</ListView>
</StackPanel>
<StackPanel>
<TextBlock Text='GridView - SelectionMode=Extended:' Margin='2'/>
<GridView x:Name='gridView2' CanReorderItems='True' AllowDrop='True' SelectionMode='Extended' Width='300' HorizontalAlignment='Left' Margin='2'>
<GridViewItem x:Name='gridViewItem4' Content='Item 4' MinWidth='120' MinHeight='60'/>
<GridViewItem x:Name='gridViewItem5' Content='Item 5' MinWidth='120' MinHeight='60'/>
<GridViewItem x:Name='gridViewItem6' Content='Item 6' MinWidth='120' MinHeight='60' IsSelected='true'/>
</GridView>
</StackPanel>
</StackPanel>
<StackPanel Orientation='Horizontal' Background="White">
<StackPanel>
<TextBlock Text='ListView - SelectionMode=Single:' Margin='2'/>
<ListView x:Name='listView3' CanReorderItems='True' AllowDrop='True' SelectionMode='Single' Width='300' HorizontalAlignment='Left' Margin='2'>
<ListViewItem x:Name='listViewItem7' Content='List Item 7'/>
<ListViewItem x:Name='listViewItem8' Content='List Item 8'/>
<ListViewItem x:Name='listViewItem9' Content='List Item 9' IsSelected='true'/>
</ListView>
</StackPanel>
<StackPanel>
<TextBlock Text='GridView - SelectionMode=Single:' Margin='2'/>
<GridView x:Name='gridView3' CanReorderItems='True' AllowDrop='True' SelectionMode='Single' Width='300' HorizontalAlignment='Left' Margin='2'>
<GridViewItem x:Name='gridViewItem7' Content='Item 7' MinWidth='120' MinHeight='60'/>
<GridViewItem x:Name='gridViewItem8' Content='Item 8' MinWidth='120' MinHeight='60'/>
<GridViewItem x:Name='gridViewItem9' Content='Item 9' MinWidth='120' MinHeight='60' IsSelected='true'/>
</GridView>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel>
<TextBlock Text="Validating" Style="{ThemeResource StandardGroupHeader}"/>
Expand Down
47 changes: 47 additions & 0 deletions dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,5 +312,52 @@ private void StandardBackground_Click(object sender, RoutedEventArgs e)
RootSampleControlsPanel.Background = new SolidColorBrush(Colors.Transparent);
}

private void CmbListViewSelectionMode_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
if (listView1 != null)
{
listView1.SelectionMode = (ListViewSelectionMode)(sender as ComboBox).SelectedIndex;
}
}

private void CmbGridViewSelectionMode_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
if (gridView1 != null)
{
gridView1.SelectionMode = (ListViewSelectionMode)(sender as ComboBox).SelectedIndex;
}
}

private void ChkListViewIsEnabled_Checked(object sender, RoutedEventArgs e)
{
if (listView1 != null)
{
listView1.IsEnabled = true;
}
}

private void ChkListViewIsEnabled_Unchecked(object sender, RoutedEventArgs e)
{
if (listView1 != null)
{
listView1.IsEnabled = false;
}
}

private void ChkGridViewIsEnabled_Checked(object sender, RoutedEventArgs e)
{
if (gridView1 != null)
{
gridView1.IsEnabled = true;
}
}

private void ChkGridViewIsEnabled_Unchecked(object sender, RoutedEventArgs e)
{
if (gridView1 != null)
{
gridView1.IsEnabled = false;
}
}
}
}
2 changes: 1 addition & 1 deletion dev/Materials/Reveal/RevealBrush_rs2_themeresources.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1977,7 +1977,7 @@
</Setter>
</Style>

<Style TargetType="ListViewItem" BasedOn="{StaticResource ListViewItemRevealStyle}" />
<!--<Style TargetType="ListViewItem" BasedOn="{StaticResource ListViewItemRevealStyle}" />-->

<Style TargetType="GridViewItem" x:Key="GridViewItemRevealStyle">
<Setter Property="Background" Value="{ThemeResource GridViewItemRevealBackground}" />
Expand Down
2 changes: 1 addition & 1 deletion dev/Materials/Reveal/RevealBrush_rs3_themeresources.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
</Setter>
</Style>

<Style TargetType="ListViewItem" BasedOn="{StaticResource ListViewItemRevealStyle}" />
<!--<Style TargetType="ListViewItem" BasedOn="{StaticResource ListViewItemRevealStyle}" />-->

<Style TargetType="GridViewItem" x:Key="GridViewItemRevealStyle">
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
Expand Down
2 changes: 1 addition & 1 deletion dev/Materials/Reveal/RevealBrush_rs4_themeresources.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1476,7 +1476,7 @@
</Setter>
</Style>

<Style TargetType="ListViewItem" BasedOn="{StaticResource ListViewItemRevealStyle}" />
<!--<Style TargetType="ListViewItem" BasedOn="{StaticResource ListViewItemRevealStyle}" />-->

<Style TargetType="GridViewItem" x:Key="GridViewItemRevealStyle">
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
Expand Down
2 changes: 1 addition & 1 deletion dev/Materials/Reveal/RevealBrush_rs5_themeresources.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
</Setter>
</Style>

<Style TargetType="ListViewItem" BasedOn="{StaticResource ListViewItemRevealStyle}" />
<!--<Style TargetType="ListViewItem" BasedOn="{StaticResource ListViewItemRevealStyle}" />-->

<Style TargetType="GridViewItem" x:Key="GridViewItemRevealStyle">
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
Expand Down
2 changes: 1 addition & 1 deletion test/MUXControlsTestApp/App.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
<ResourceDictionary.MergedDictionaries>
<controls:XamlControlsResources/>
<controls:XamlControlsResources Version="Latest"/>

<!-- NOTE: If you change this entry, you must update App.StyleOverridesPlaceholder -->
<ResourceDictionary x:Name="_styleOverridesPlaceholder"/>
Expand Down

0 comments on commit 3ef1988

Please sign in to comment.