NavigationView top nav foreground & FontIconSource

iNKORE-NET · Feb 2, 2024 · 63cc67c · 63cc67c
1 parent df399d2
commit 63cc67c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/NavigationView/NavigationView.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/NavigationView/NavigationView.xaml
@@ -317,7 +317,7 @@
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center" 
                                     Content="{TemplateBinding Icon}"
-                                    TextElement.Foreground="{TemplateBinding Foreground}" ClipToBounds="False">
+                                    Foreground="{TemplateBinding Foreground}" ClipToBounds="False">
                                 </ui:ContentPresenterEx>
                                 <ContentPresenter
                                     x:Name="InfoBadgePresenter"
@@ -441,7 +441,7 @@
                                     Content="{TemplateBinding Content}"
                                     ContentTemplate="{TemplateBinding ContentTemplate}"
                                     ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                    Foreground="{TemplateBinding Foreground}"
+                                    TextElement.Foreground="{Binding ElementName=IconBox, Path=Foreground}"
                                     TextWrapping="NoWrap" />
                                 <Grid
                                     x:Name="ExpandCollapseChevron"
@@ -562,19 +562,16 @@
                         <Trigger SourceName="PointerStatesListener" Property="CurrentStateName" Value="Selected">
                             <Setter TargetName="LayoutRoot" Property="Background" Value="{DynamicResource TopNavigationViewItemBackgroundSelected}" />
                             <Setter TargetName="PointerRectangle" Property="Fill" Value="{DynamicResource NavigationViewItemBackgroundSelected}" />
-                            <Setter TargetName="IconBox" Property="Foreground" Value="{DynamicResource TopNavigationViewItemForegroundSelected}" />
                             <Setter Property="Foreground" Value="{DynamicResource TopNavigationViewItemForegroundSelected}" />
                         </Trigger>
                         <Trigger SourceName="PointerStatesListener" Property="CurrentStateName" Value="PointerOverSelected">
                             <Setter TargetName="LayoutRoot" Property="Background" Value="{DynamicResource TopNavigationViewItemBackgroundSelectedPointerOver}" />
                             <Setter TargetName="PointerRectangle" Property="Fill" Value="{DynamicResource NavigationViewItemBackgroundSelectedPointerOver}" />
-                            <Setter TargetName="IconBox" Property="Foreground" Value="{DynamicResource TopNavigationViewItemForegroundSelectedPointerOver}" />
                             <Setter Property="Foreground" Value="{DynamicResource TopNavigationViewItemForegroundSelectedPointerOver}" />
                         </Trigger>
                         <Trigger SourceName="PointerStatesListener" Property="CurrentStateName" Value="PressedSelected">
                             <Setter TargetName="LayoutRoot" Property="Background" Value="{DynamicResource TopNavigationViewItemBackgroundSelectedPressed}" />
                             <Setter TargetName="PointerRectangle" Property="Fill" Value="{DynamicResource NavigationViewItemBackgroundSelectedPressed}" />
-                            <Setter TargetName="IconBox" Property="Foreground" Value="{DynamicResource TopNavigationViewItemForegroundSelectedPressed}" />
                             <Setter Property="Foreground" Value="{DynamicResource TopNavigationViewItemForegroundSelectedPressed}" />
                         </Trigger>
                         <Trigger SourceName="DisabledStatesListener" Property="CurrentStateName" Value="Disabled">

diff --git a/source/iNKORE.UI.WPF.Modern.Controls/iNKORE.UI.WPF.Modern.Controls.csproj b/source/iNKORE.UI.WPF.Modern.Controls/iNKORE.UI.WPF.Modern.Controls.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-windows10.0.18362.0;net462</TargetFrameworks>
+		<TargetFrameworks>net6.0-windows10.0.18362.0;net452</TargetFrameworks>
 		<UseWPF>true</UseWPF>
 		<NeutralLanguage>en-US</NeutralLanguage>
 		<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);GetDocumentationFile</TargetsForTfmSpecificBuildOutput>
@@ -78,7 +78,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="iNKORE.UI.WPF" Version="1.1.0" />
+	  <PackageReference Include="iNKORE.UI.WPF" Version="1.1.0.2" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/source/iNKORE.UI.WPF.Modern/Common/FontIconSource.cs b/source/iNKORE.UI.WPF.Modern/Common/FontIconSource.cs
@@ -12,7 +12,7 @@ namespace iNKORE.UI.WPF.Modern.Common
     /// </summary>
     public class FontIconSource : IconSource
     {
-        const string c_fontIconSourceDefaultFontFamily = "Segoe MDL2 Assets";
+        const string c_fontIconSourceDefaultFontFamily = "Segoe Fluent Icons,Segoe MDL2 Assets,Segoe UI Symbol";//"Segoe MDL2 Assets";
 
         /// <summary>
         /// Initializes a new instance of the <see cref="FontIconSource"/> class.
@@ -51,7 +51,7 @@ public FontFamily FontFamily
                 nameof(FontSize),
                 typeof(double),
                 typeof(FontIconSource),
-                new PropertyMetadata(20.0));
+                new PropertyMetadata(16d));
 
         /// <summary>
         /// Gets or sets the size of the icon glyph.

diff --git a/source/iNKORE.UI.WPF.Modern/iNKORE.UI.WPF.Modern.csproj b/source/iNKORE.UI.WPF.Modern/iNKORE.UI.WPF.Modern.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-windows10.0.18362.0;net462</TargetFrameworks>
+		<TargetFrameworks>net6.0-windows10.0.18362.0;net452</TargetFrameworks>
 		<UseWPF>true</UseWPF>
 		<UseWinRT>true</UseWinRT>
 		<NeutralLanguage>en-US</NeutralLanguage>
@@ -77,7 +77,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="iNKORE.UI.WPF" Version="1.1.0" />
+	  <PackageReference Include="iNKORE.UI.WPF" Version="1.1.0.2" />
 	</ItemGroup>
 
 	<ItemGroup>