Skip to content

Commit 1107889

Browse files
lukeblevinslukeblevins
committed
Remove Unnecessary Styling
1 parent 2ade23f commit 1107889

File tree

1 file changed

+8
-77
lines changed

1 file changed

+8
-77
lines changed

‎Files UWP/ProHome.xaml

Lines changed: 8 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -446,81 +446,7 @@
446446
</Setter>
447447
</Style>
448448

449-
<Style x:Key="FluentListViewItemContainerStyle" TargetType="ListViewItem">
450-
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}"/>
451-
<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}"/>
452-
<Setter Property="Background" Value="{ThemeResource ListViewItemBackground}"/>
453-
<Setter Property="Foreground" Value="{ThemeResource ListViewItemForeground}"/>
454-
<Setter Property="TabNavigation" Value="Local"/>
455-
<Setter Property="IsHoldingEnabled" Value="True"/>
456-
<Setter Property="Padding" Value="12,0,12,0"/>
457-
<Setter Property="HorizontalContentAlignment" Value="Left"/>
458-
<Setter Property="VerticalContentAlignment" Value="Center"/>
459-
<Setter Property="MinWidth" Value="{ThemeResource ListViewItemMinWidth}"/>
460-
<Setter Property="MinHeight" Value="{ThemeResource ListViewItemMinHeight}"/>
461-
<Setter Property="AllowDrop" Value="False"/>
462-
<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}"/>
463-
<Setter Property="FocusVisualMargin" Value="0"/>
464-
<Setter Property="Template">
465-
<Setter.Value>
466-
<ControlTemplate TargetType="ListViewItem">
467-
<ListViewItemPresenter x:Name="Root" CheckBrush="{ThemeResource ListViewItemCheckBrush}" ContentMargin="{TemplateBinding Padding}" CheckBoxBrush="{ThemeResource ListViewItemCheckBoxBrush}" ContentTransitions="{TemplateBinding ContentTransitions}" CheckMode="{ThemeResource ListViewItemCheckMode}" DragOpacity="{ThemeResource ListViewItemDragThemeOpacity}" DisabledOpacity="{ThemeResource ListViewItemDisabledThemeOpacity}" DragBackground="{ThemeResource ListViewItemDragBackground}" DragForeground="{ThemeResource ListViewItemDragForeground}" FocusBorderBrush="{ThemeResource ListViewItemFocusBorderBrush}" FocusVisualMargin="{TemplateBinding FocusVisualMargin}" FocusSecondaryBorderBrush="{ThemeResource ListViewItemFocusSecondaryBorderBrush}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Control.IsTemplateFocusTarget="True" PressedBackground="{ThemeResource ListViewItemBackgroundPressed}" PlaceholderBackground="{ThemeResource ListViewItemPlaceholderBackground}" PointerOverForeground="{ThemeResource ListViewItemForegroundPointerOver}" PointerOverBackground="{ThemeResource ListViewItemBackgroundPointerOver}" RevealBorderThickness="{ThemeResource ListViewItemRevealBorderThemeThickness}" ReorderHintOffset="{ThemeResource ListViewItemReorderHintThemeOffset}" RevealBorderBrush="{ThemeResource ListViewItemRevealBorderBrush}" RevealBackground="{ThemeResource ListViewItemRevealBackground}" SelectedForeground="{ThemeResource ListViewItemForegroundSelected}" SelectionCheckMarkVisualEnabled="{ThemeResource ListViewItemSelectionCheckMarkVisualEnabled}" SelectedBackground="{ThemeResource ListViewItemBackgroundPressed}" SelectedPressedBackground="{ThemeResource ListViewItemBackgroundPressed}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" SelectedPointerOverBackground="{ThemeResource ListViewItemBackgroundPressed}">
468-
<VisualStateManager.VisualStateGroups>
469-
<VisualStateGroup x:Name="CommonStates">
470-
<VisualState x:Name="Normal"/>
471-
<VisualState x:Name="Selected">
472-
<VisualState.Setters>
473-
<Setter Target="Root.FontWeight" Value="Bold"/>
474-
</VisualState.Setters>
475-
</VisualState>
476-
<VisualState x:Name="PointerOver">
477-
<VisualState.Setters>
478-
<Setter Target="Root.(RevealBrush.State)" Value="PointerOver"/>
479-
<Setter Target="Root.RevealBorderBrush" Value="{ThemeResource ListViewItemRevealBorderBrushPointerOver}"/>
480-
</VisualState.Setters>
481-
</VisualState>
482-
<VisualState x:Name="PointerOverSelected">
483-
<VisualState.Setters>
484-
<Setter Target="Root.(RevealBrush.State)" Value="PointerOver"/>
485-
<Setter Target="Root.RevealBorderBrush" Value="{ThemeResource ListViewItemRevealBorderBrushPointerOver}"/>
486-
<Setter Target="Root.FontWeight" Value="Bold"/>
487-
</VisualState.Setters>
488-
</VisualState>
489-
<VisualState x:Name="PointerOverPressed">
490-
<VisualState.Setters>
491-
<Setter Target="Root.(RevealBrush.State)" Value="Pressed"/>
492-
<Setter Target="Root.RevealBorderBrush" Value="{ThemeResource ListViewItemRevealBorderBrushPressed}"/>
493-
<Setter Target="Root.FontWeight" Value="Bold"/>
494-
</VisualState.Setters>
495-
</VisualState>
496-
<VisualState x:Name="Pressed">
497-
<VisualState.Setters>
498-
<Setter Target="Root.(RevealBrush.State)" Value="Pressed"/>
499-
<Setter Target="Root.RevealBorderBrush" Value="{ThemeResource ListViewItemRevealBorderBrushPressed}"/>
500-
</VisualState.Setters>
501-
</VisualState>
502-
<VisualState x:Name="PressedSelected">
503-
<VisualState.Setters>
504-
<Setter Target="Root.(RevealBrush.State)" Value="Pressed"/>
505-
<Setter Target="Root.RevealBorderBrush" Value="{ThemeResource ListViewItemRevealBorderBrushPressed}"/>
506-
<Setter Target="Root.FontWeight" Value="Bold"/>
507-
</VisualState.Setters>
508-
</VisualState>
509-
</VisualStateGroup>
510-
<VisualStateGroup x:Name="DisabledStates">
511-
<VisualState x:Name="Enabled"/>
512-
<VisualState x:Name="Disabled">
513-
<VisualState.Setters>
514-
<Setter Target="Root.RevealBorderThickness" Value="0"/>
515-
</VisualState.Setters>
516-
</VisualState>
517-
</VisualStateGroup>
518-
</VisualStateManager.VisualStateGroups>
519-
</ListViewItemPresenter>
520-
</ControlTemplate>
521-
</Setter.Value>
522-
</Setter>
523-
</Style>
449+
524450
</Page.Resources>
525451

526452
<Grid Padding="0,0,0,0">
@@ -731,8 +657,13 @@
731657
<ScrollViewer VerticalScrollBarVisibility="Auto">
732658
<Grid>
733659
<StackPanel>
660+
<StackPanel.Resources>
661+
<SolidColorBrush x:Key="ListViewItemBackgroundSelected" Color="LightGray"/>
662+
<SolidColorBrush x:Key="ListViewItemBackgroundSelectedPointerOver" Color="LightGray"/>
663+
<SolidColorBrush x:Key="ListViewItemBackgroundSelectedPressed" Color="LightGray"/>
664+
</StackPanel.Resources>
734665
<TextBlock Margin="10" Text="Locations" FontSize="14" FontWeight="Bold" Padding="0" VerticalAlignment="Stretch"/>
735-
<ListView ItemContainerStyle="{StaticResource FluentListViewItemContainerStyle}" SelectionChanged="LocationsList_SelectionChanged" SelectionMode="Single" IsItemClickEnabled="True" ItemClick="LocationsList_ItemClick" Name="LocationsList">
666+
<ListView SelectionChanged="LocationsList_SelectionChanged" SelectionMode="Single" IsItemClickEnabled="True" ItemClick="LocationsList_ItemClick" Name="LocationsList">
736667
<ListView.Resources>
737668
<ResourceDictionary Source="ms-appx:///Microsoft.UI.Xaml/DensityStyles/Compact.xaml" />
738669
</ListView.Resources>
@@ -794,7 +725,7 @@
794725
</ListViewItem>
795726
</ListView>
796727
<TextBlock Margin="10" Text="Drives" FontSize="14" FontWeight="Bold" Padding="0" VerticalAlignment="Stretch"/>
797-
<ListView ItemContainerStyle="{StaticResource FluentListViewItemContainerStyle}" SelectionChanged="DrivesList_SelectionChanged" SelectionMode="Single" IsItemClickEnabled="True" ItemClick="DrivesList_ItemClick" Name="DrivesList">
728+
<ListView SelectionChanged="DrivesList_SelectionChanged" SelectionMode="Single" IsItemClickEnabled="True" ItemClick="DrivesList_ItemClick" Name="DrivesList">
798729
<ListView.Resources>
799730
<ResourceDictionary Source="ms-appx:///Microsoft.UI.Xaml/DensityStyles/Compact.xaml" />
800731
</ListView.Resources>

0 commit comments

Comments
 (0)