Merge pull request #844 from lepoco/development

Merge development
lepoco · Nov 24, 2023 · 8afb0d9 · 8afb0d9
2 parents cc4f708 + 68e6ee6
commit 8afb0d9
Show file tree

Hide file tree

Showing 28 changed files with 191 additions and 161 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Version>3.0.0-preview.10</Version>
+    <Version>3.0.0-preview.11</Version>
     <LangVersion>12.0</LangVersion>
     <Deterministic>true</Deterministic>
   </PropertyGroup>

diff --git a/src/Wpf.Ui.Demo.Mvvm/Usings.cs b/src/Wpf.Ui.Demo.Mvvm/Usings.cs
@@ -3,6 +3,6 @@
 // Copyright (C) Leszek Pomianowski and WPF UI Contributors.
 // All Rights Reserved.
 
+global using System.Windows;
 global using CommunityToolkit.Mvvm.ComponentModel;
 global using CommunityToolkit.Mvvm.Input;
-global using System.Windows;
diff --git a/src/Wpf.Ui.Demo.Simple/MainWindow.xaml b/src/Wpf.Ui.Demo.Simple/MainWindow.xaml
@@ -72,7 +72,7 @@
             <ui:NavigationView.FooterMenuItems>
                 <ui:NavigationViewItem
                     Content="Settings"
-                    NavigationCacheMode="Enabled"
+                    NavigationCacheMode="Disabled"
                     TargetPageType="{x:Type pages:SettingsPage}">
                     <ui:NavigationViewItem.Icon>
                         <ui:SymbolIcon Symbol="Settings24" />

diff --git a/src/Wpf.Ui.Extension.Template.Compact/Usings.cs b/src/Wpf.Ui.Extension.Template.Compact/Usings.cs
@@ -1,5 +1,5 @@
-global using CommunityToolkit.Mvvm.ComponentModel;
-global using CommunityToolkit.Mvvm.Input;
-global using System;
+global using System;
 global using System.Windows;
+global using CommunityToolkit.Mvvm.ComponentModel;
+global using CommunityToolkit.Mvvm.Input;
 global using Wpf.Ui.Services;
diff --git a/src/Wpf.Ui.Extension.Template.Fluent/Usings.cs b/src/Wpf.Ui.Extension.Template.Fluent/Usings.cs
@@ -1,5 +1,5 @@
-global using CommunityToolkit.Mvvm.ComponentModel;
-global using CommunityToolkit.Mvvm.Input;
-global using System;
+global using System;
 global using System.Windows;
+global using CommunityToolkit.Mvvm.ComponentModel;
+global using CommunityToolkit.Mvvm.Input;
 global using Wpf.Ui.Services;
diff --git a/src/Wpf.Ui.Gallery/Usings.cs b/src/Wpf.Ui.Gallery/Usings.cs
@@ -3,11 +3,6 @@
 // Copyright (C) Leszek Pomianowski and WPF UI Contributors.
 // All Rights Reserved.
 
-global using CommunityToolkit.Mvvm.ComponentModel;
-global using CommunityToolkit.Mvvm.Input;
-global using Microsoft.Extensions.Configuration;
-global using Microsoft.Extensions.DependencyInjection;
-global using Microsoft.Extensions.Hosting;
 global using System;
 global using System.Collections.Generic;
 global using System.Collections.ObjectModel;
@@ -25,3 +20,8 @@
 global using System.Windows.Markup;
 global using System.Windows.Media;
 global using System.Windows.Threading;
+global using CommunityToolkit.Mvvm.ComponentModel;
+global using CommunityToolkit.Mvvm.Input;
+global using Microsoft.Extensions.Configuration;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Hosting;
diff --git a/src/Wpf.Ui.SyntaxHighlight/Controls/CodeBlock.xaml b/src/Wpf.Ui.SyntaxHighlight/Controls/CodeBlock.xaml
@@ -14,16 +14,8 @@
     <Thickness x:Key="CodeBlockBorderThemeThickness">1</Thickness>
 
     <Style TargetType="{x:Type syntax:CodeBlock}">
-        <Setter Property="Background">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}" />
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Foreground">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
-            </Setter.Value>
-        </Setter>
+        <Setter Property="Background" Value="{DynamicResource ControlFillColorDefaultBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}"/>
         <Setter Property="Padding" Value="{StaticResource CodeBlockPadding}" />
         <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
         <Setter Property="BorderThickness" Value="{StaticResource CodeBlockBorderThemeThickness}" />

diff --git a/src/Wpf.Ui.Tray/Wpf.Ui.Tray.csproj b/src/Wpf.Ui.Tray/Wpf.Ui.Tray.csproj
@@ -22,6 +22,7 @@
   <PropertyGroup>
     <GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
     <GenerateDocumentationFile Condition="'$(Configuration)'=='Release'">true</GenerateDocumentationFile>
+    <DebugType Condition="'$(Configuration)'=='Release'">none</DebugType>
     <PackageIcon>wpfui.png</PackageIcon>
   </PropertyGroup>
 

diff --git a/src/Wpf.Ui/Controls/Badge/Badge.xaml b/src/Wpf.Ui/Controls/Badge/Badge.xaml
@@ -1,4 +1,4 @@
-<!--
+<!--
     This Source Code Form is subject to the terms of the MIT License.
     If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
     Copyright (C) Leszek Pomianowski and WPF UI Contributors.
@@ -11,16 +11,8 @@
     xmlns:controls="clr-namespace:Wpf.Ui.Controls">
 
     <Style TargetType="{x:Type controls:Badge}">
-        <Setter Property="Foreground">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Background">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource SystemAccentColorSecondary}" />
-            </Setter.Value>
-        </Setter>
+        <Setter Property="Foreground" Value="{DynamicResource BadgeForeground}"/>
+        <Setter Property="Background" Value="{DynamicResource BadgeBackground}"/>
         <!--<Setter Property="BorderBrush" Value="{DynamicResource SystemAccentBrush}" />-->
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="Padding" Value="4" />
@@ -41,11 +33,7 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="Appearance" Value="Primary">
-                            <Setter Property="Foreground">
-                                <Setter.Value>
-                                    <SolidColorBrush Color="{DynamicResource TextOnAccentFillColorPrimary}" />
-                                </Setter.Value>
-                            </Setter>
+                            <Setter Property="Foreground" Value="{DynamicResource BadgeForeground}"/>
                         </Trigger>
                         <Trigger Property="Appearance" Value="Transparent">
                             <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />

diff --git a/src/Wpf.Ui/Controls/CardColor/CardColor.xaml b/src/Wpf.Ui/Controls/CardColor/CardColor.xaml
@@ -43,11 +43,8 @@
                             <TextBlock
                                 Margin="0"
                                 FontSize="{TemplateBinding SubtitleFontSize}"
-                                Text="{TemplateBinding Subtitle}">
-                                <TextBlock.Foreground>
-                                    <SolidColorBrush Color="{DynamicResource CardForegroundPressed}" />
-                                </TextBlock.Foreground>
-                            </TextBlock>
+                                Foreground="{DynamicResource CardForegroundPressed}"
+                                Text="{TemplateBinding Subtitle}" />
                         </StackPanel>
                     </Border>
                 </ControlTemplate>

diff --git a/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml b/src/Wpf.Ui/Controls/ComboBox/ComboBox.xaml
@@ -14,7 +14,6 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:Wpf.Ui.Controls"
-    xmlns:converters="clr-namespace:Wpf.Ui.Converters"
     xmlns:system="clr-namespace:System;assembly=System.Runtime">
 
     <Thickness x:Key="ComboBoxPadding">10,8,10,8</Thickness>
@@ -138,11 +137,7 @@
                             <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ComboBoxItemForegroundSelected}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Foreground">
-                                <Setter.Value>
-                                    <SolidColorBrush Color="{DynamicResource ComboBoxItemForeground}" />
-                                </Setter.Value>
-                            </Setter>
+                            <Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>

diff --git a/src/Wpf.Ui/Controls/Expander/Expander.xaml b/src/Wpf.Ui/Controls/Expander/Expander.xaml
@@ -30,6 +30,7 @@
                 Grid.Column="0"
                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                TextElement.FontSize="{TemplateBinding FontSize}"
                 Content="{TemplateBinding Content}" />
             <Grid
                 x:Name="ChevronGrid"

diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationCache.cs b/src/Wpf.Ui/Controls/NavigationView/NavigationCache.cs
@@ -22,16 +22,34 @@ internal class NavigationCache
 
         if (cacheMode == NavigationCacheMode.Disabled)
         {
+#if DEBUG
+            System
+                .Diagnostics
+                .Debug
+                .WriteLine($"Cache for {entryType} is disabled. Generating instance using action...");
+#endif
+
             return generate.Invoke();
         }
 
         if (!_entires.TryGetValue(entryType, out var value))
         {
+#if DEBUG
+            System
+                .Diagnostics
+                .Debug
+                .WriteLine($"{entryType} not found in cache, generating instance using action...");
+#endif
+
             value = generate.Invoke();
 
             _entires.Add(entryType, value);
         }
 
+#if DEBUG
+        System.Diagnostics.Debug.WriteLine($"{entryType} found in cache.");
+#endif
+
         return value;
     }
 }
diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationCacheMode.cs b/src/Wpf.Ui/Controls/NavigationView/NavigationCacheMode.cs
@@ -27,5 +27,5 @@ public enum NavigationCacheMode
     /// <summary>
     /// The page is cached and the cached instance is reused for every visit regardless of the cache size for the frame.
     /// </summary>
-    Reguired
+    Required
 }
diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationView.Navigation.cs b/src/Wpf.Ui/Controls/NavigationView/NavigationView.Navigation.cs
@@ -239,8 +239,11 @@ private void AddToJournal(INavigationViewItem viewItem, bool isBackwardsNavigate
 
 #if DEBUG
         Debug.WriteLineIf(EnableDebugMessages, $"JOURNAL INDEX {_currentIndexInJournal}");
+
         if (Journal.Count > 0)
+        {
             Debug.WriteLineIf(EnableDebugMessages, $"JOURNAL LAST ELEMENT {Journal[^1]}");
+        }
 #endif
     }
 
@@ -263,26 +266,54 @@ private object GetNavigationItemInstance(INavigationViewItem viewItem)
                 ?? throw new ArgumentNullException($"{nameof(_pageService.GetPage)} returned null");
         }
 
-        return NavigationViewActivator.CreateInstance(viewItem.TargetPageType)
-            ?? throw new ArgumentException("Failed to create instance of the page");
+        return _cache.Remember(
+                viewItem.TargetPageType,
+                viewItem.NavigationCacheMode,
+                ComputeCachedNavigationInstance
+            )
+            ?? throw new ArgumentNullException(
+                $"Unable to get or create instance of {viewItem.TargetPageType} from cache."
+            );
 
-        //return _cache.Remember(viewItem.TargetPageType, viewItem.NavigationCacheMode, () =>
-        //{
-        //    if (_serviceProvider is not null)
-        //    {
-        //        return _serviceProvider.GetService(viewItem.TargetPageType) ??
-        //               new ArgumentNullException($"{nameof(_serviceProvider.GetService)} returned null");
-        //    }
-
-        //    if (_pageService is not null)
-        //    {
-        //        return _pageService.GetPage(viewItem.TargetPageType) ??
-        //               throw new ArgumentNullException($"{nameof(_pageService.GetPage)} returned null");
-        //    }
-
-        //    return NavigationViewActivator.CreateInstance(viewItem.TargetPageType) ??
-        //        throw new ArgumentException("Failed to create instance of the page");
-        //});
+        object? ComputeCachedNavigationInstance() => GetPageInstanceFromCache(viewItem.TargetPageType);
+    }
+
+    private object? GetPageInstanceFromCache(Type? targetPageType)
+    {
+        if (targetPageType is null)
+        {
+            return default;
+        }
+
+        if (_serviceProvider is not null)
+        {
+#if DEBUG
+            System
+                .Diagnostics
+                .Debug
+                .WriteLine($"Getting {targetPageType} from cache using IServiceProvider.");
+#endif
+
+            return _serviceProvider.GetService(targetPageType)
+                ?? new ArgumentNullException($"{nameof(_serviceProvider.GetService)} returned null");
+        }
+
+        if (_pageService is not null)
+        {
+#if DEBUG
+            System.Diagnostics.Debug.WriteLine($"Getting {targetPageType} from cache using IPageService.");
+#endif
+
+            return _pageService.GetPage(targetPageType)
+                ?? throw new ArgumentNullException($"{nameof(_pageService.GetPage)} returned null");
+        }
+
+#if DEBUG
+        System.Diagnostics.Debug.WriteLine($"Getting {targetPageType} from cache using reflection.");
+#endif
+
+        return NavigationViewActivator.CreateInstance(targetPageType)
+            ?? throw new ArgumentException("Failed to create instance of the page");
     }
 
     private static void ApplyAttachedProperties(INavigationViewItem viewItem, object pageInstance)

diff --git a/src/Wpf.Ui/Controls/NavigationView/NavigationViewTop.xaml b/src/Wpf.Ui/Controls/NavigationView/NavigationViewTop.xaml
@@ -192,14 +192,11 @@
                     BorderBrush="{DynamicResource FlyoutBackground}"
                     BorderThickness="1"
                     CornerRadius="8"
+                    Background="{DynamicResource FlyoutBorderBrush}"
                     SnapsToDevicePixels="True">
                     <Border.RenderTransform>
                         <TranslateTransform />
                     </Border.RenderTransform>
-                    <Border.Background>
-                        <SolidColorBrush Color="{DynamicResource FlyoutBorderBrush}" />
-                    </Border.Background>
-
                     <Border.Effect>
                         <DropShadowEffect
                             BlurRadius="20"

diff --git a/src/Wpf.Ui/Controls/TextBox/TextBox.xaml b/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
@@ -184,6 +184,7 @@
                             Margin="0"
                             Padding="1,0"
                             VerticalAlignment="Center"
+                            FontSize="{TemplateBinding FontSize}"
                             Foreground="{DynamicResource TextControlPlaceholderForeground}"
                             Text="{TemplateBinding PlaceholderText}" />
                     </Grid>

diff --git a/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml b/src/Wpf.Ui/Controls/TitleBar/TitleBar.xaml
@@ -145,6 +145,7 @@
                             <!--  Main application title  -->
                             <TextBlock
                                 Grid.Column="1"
+                                FontSize="12"
                                 VerticalAlignment="Center"
                                 Text="{TemplateBinding Title}" />
                         </Grid>

diff --git a/src/Wpf.Ui/Controls/ToggleButton/ToggleButton.xaml b/src/Wpf.Ui/Controls/ToggleButton/ToggleButton.xaml
@@ -53,7 +53,8 @@
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             Content="{TemplateBinding Content}"
-                            TextElement.Foreground="{TemplateBinding Foreground}" />
+                            TextElement.Foreground="{TemplateBinding Foreground}"
+                            TextElement.FontSize="{TemplateBinding FontSize}"/>
                     </Border>
                     <ControlTemplate.Triggers>
                         <MultiTrigger>

diff --git a/src/Wpf.Ui/Interop/UnsafeNativeMethods.cs b/src/Wpf.Ui/Interop/UnsafeNativeMethods.cs
@@ -297,11 +297,11 @@ public static bool ApplyWindowLegacyMicaEffect(IntPtr handle)
 
         // TODO: Validate HRESULT
         _ = Dwmapi.DwmSetWindowAttribute(
-             handle,
-             Dwmapi.DWMWINDOWATTRIBUTE.DWMWA_MICA_EFFECT,
-             ref backdropPvAttribute,
-             Marshal.SizeOf(typeof(int))
-         );
+            handle,
+            Dwmapi.DWMWINDOWATTRIBUTE.DWMWA_MICA_EFFECT,
+            ref backdropPvAttribute,
+            Marshal.SizeOf(typeof(int))
+        );
 
         return true;
     }