1.0.6 (#82)

1.0.6
Panuon · Aug 12, 2022 · e6e2aa2 · e6e2aa2
1 parent d35b156
commit e6e2aa2
Show file tree

Hide file tree

Showing 28 changed files with 214 additions and 77 deletions.
diff --git a/Samples/Views/Examples/NeteaseMusicView.xaml b/Samples/Views/Examples/NeteaseMusicView.xaml
@@ -103,14 +103,14 @@
                     Value="{x:Null}" />
             <Setter Property="ItemsHoverForeground"
                     Value="#C62F2F" />
-            <!--<Setter Property="ItemContainerStyle">
+            <Setter Property="ItemContainerStyle">
                 <Setter.Value>
                     <Style TargetType="pu:SearchBoxItem">
                         <Setter Property="Height"
                                 Value="50" />
                     </Style>
                 </Setter.Value>
-            </Setter>-->
+            </Setter>
             <Setter Property="ItemTemplate">
                 <Setter.Value>
                     <DataTemplate>

diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Controls/PendingBoxWindow.cs b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Controls/PendingBoxWindow.cs
@@ -66,7 +66,7 @@ public PendingBoxWindow(Window owner, bool interopOwnersMask, Rect? ownerRect, s
             _cancelButtonStyle = XamlUtil.FromXaml<Style>(cancelButtonStyle);
             _spinnerStyle = XamlUtil.FromXaml<Style>(spinnerStyle);
 
-            if(ownerRect == null)
+            if (ownerRect == null)
             {
                 WindowStartupLocation = owner == null
                   ? WindowStartupLocation.CenterScreen

diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/ComboBoxStyle.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/ComboBoxStyle.xaml
@@ -8,6 +8,7 @@
     <ResourceDictionary.MergedDictionaries>
         <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Styles/ButtonStyle.xaml" />
         <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Styles/TextBoxStyle.xaml" />
+        <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Styles/ComboBoxItemStyle.xaml" />
         <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Templates/ComboBoxTemplate.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
@@ -181,6 +182,8 @@
                 Value="Center" />
         <Setter Property="HorizontalContentAlignment"
                 Value="Stretch" />
+        <Setter Property="ItemContainerStyle"
+                Value="{StaticResource {x:Static rs:StyleKeys.ComboBoxItemStyle}}" />
         <Setter Property="ItemsPanel">
             <Setter.Value>
                 <ItemsPanelTemplate>

diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/DataGridStyle.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/DataGridStyle.xaml
@@ -50,6 +50,8 @@
                 Value="Center" />
         <Setter Property="Content"
                 Value="&#xe903;" />
+        <Setter Property="Foreground"
+                Value="{Binding Foreground, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Mode=OneWay}" />
         <Setter Property="FontFamily"
                 Value="/Panuon.WPF.UI;component/Resources/Fonts/#PanuonIcon" />
         <Setter Property="Padding"

diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/ExpanderStyle.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/ExpanderStyle.xaml
@@ -20,6 +20,8 @@
                 Value="/Panuon.WPF.UI;component/Resources/Fonts/#PanuonIcon" />
         <Setter Property="Content"
                 Value="&#xe903;" />
+        <Setter Property="Foreground"
+                Value="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource AncestorType=Expander}, Mode=OneWay}" />
         <Setter Property="Margin"
                 Value="2,0" />
         <Setter Property="AnimationDuration"

diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/ListBoxItemStyle.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/ListBoxItemStyle.xaml
@@ -49,6 +49,16 @@
                 Value="{Binding Path=(local:IconHelper.FontSize), RelativeSource={RelativeSource AncestorType=ListBox}, Mode=OneWay}" />
         <Setter Property="local:IconHelper.FontFamily"
                 Value="{Binding Path=(local:IconHelper.FontFamily), RelativeSource={RelativeSource AncestorType=ListBox}, Mode=OneWay}" />
+        <Setter Property="local:ShadowHelper.BlurRadius"
+                Value="{Binding Path=(local:ShadowHelper.BlurRadius), RelativeSource={RelativeSource AncestorType=ListBox}, Mode=OneWay}" />
+        <Setter Property="local:ShadowHelper.Direction"
+                Value="{Binding Path=(local:ShadowHelper.Direction), RelativeSource={RelativeSource AncestorType=ListBox}, Mode=OneWay}" />
+        <Setter Property="local:ShadowHelper.Opacity"
+                Value="{Binding Path=(local:ShadowHelper.Opacity), RelativeSource={RelativeSource AncestorType=ListBox}, Mode=OneWay}" />
+        <Setter Property="local:ShadowHelper.RenderingBias"
+                Value="{Binding Path=(local:ShadowHelper.RenderingBias), RelativeSource={RelativeSource AncestorType=ListBox}, Mode=OneWay}" />
+        <Setter Property="local:ShadowHelper.ShadowDepth"
+                Value="{Binding Path=(local:ShadowHelper.ShadowDepth), RelativeSource={RelativeSource AncestorType=ListBox}, Mode=OneWay}" />
         <Setter Property="local:ListBoxItemHelper.Icon"
                 Value="{Binding Path=(local:ListBoxHelper.ItemsIcon), RelativeSource={RelativeSource AncestorType=ListBox}, Mode=OneWay}" />
         <Setter Property="local:ListBoxItemHelper.IconPlacement"

diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/ListBoxStyle.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/ListBoxStyle.xaml
@@ -7,6 +7,7 @@
                     xmlns:irs="clr-namespace:Panuon.WPF.UI.Internal.Resources">
     <ResourceDictionary.MergedDictionaries>
         <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Styles/ButtonStyle.xaml" />
+        <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Styles/ListBoxItemStyle.xaml" />
         <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Templates/ListBoxTemplate.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
@@ -63,6 +64,8 @@
                 Value="5" />
         <Setter Property="VerticalContentAlignment"
                 Value="Center" />
+        <Setter Property="ItemContainerStyle"
+                Value="{StaticResource {x:Static rs:StyleKeys.ListBoxItemStyle}}" />
         <Setter Property="Template"
                 Value="{StaticResource {x:Static irs:TemplateKeys.ListBoxTemplate}}" />
         <Style.Triggers>

diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/MenuStyle.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/MenuStyle.xaml
@@ -6,6 +6,7 @@
                     xmlns:rs="clr-namespace:Panuon.WPF.UI.Resources"
                     xmlns:irs="clr-namespace:Panuon.WPF.UI.Internal.Resources">
     <ResourceDictionary.MergedDictionaries>
+        <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Styles/MenuItemStyle.xaml" />
         <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Templates/MenuTemplate.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
@@ -108,6 +109,8 @@
                 Value="{StaticResource {ComponentResourceKey ResourceId=SubemnuArrowIconTemplate, TypeInTargetAssembly={x:Type local:MenuHelper}}}" />
         <Setter Property="local:MenuHelper.CheckedIconTemplate"
                 Value="{StaticResource {ComponentResourceKey ResourceId=CheckedIconStyle, TypeInTargetAssembly={x:Type local:MenuHelper}}}" />
+        <Setter Property="ItemContainerStyle"
+                Value="{StaticResource {x:Static rs:StyleKeys.MenuItemStyle}}" />
         <Setter Property="Template"
                 Value="{StaticResource {x:Static irs:TemplateKeys.MenuTemplate}}" />
         <Style.Triggers>

diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/SearchBoxStyle.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/SearchBoxStyle.xaml
@@ -43,16 +43,14 @@
                 Value="{Binding Path=(i:VisualStateHelper.BorderBrush), RelativeSource={RelativeSource Self}, Mode=OneWay}" />
         <Setter Property="local:DropDownHelper.BorderThickness"
                 Value="{Binding BorderThickness, RelativeSource={RelativeSource Self}, Mode=OneWay}" />
-        <Setter Property="local:DropDownHelper.MinWidth"
+        <Setter Property="local:DropDownHelper.Width"
                 Value="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Mode=OneWay}" />
-        <Setter Property="local:DropDownHelper.MaxHeight"
+        <Setter Property="local:DropDownHelper.Height"
                 Value="{Binding MaxDropDownHeight, RelativeSource={RelativeSource Self}, Mode=OneWay}" />
         <Setter Property="local:DropDownHelper.Placement"
                 Value="BottomRight" />
-        <!--<Setter Property="TextBoxStyle"
-                Value="{StaticResource {ComponentResourceKey ResourceId=TextBoxStyle, TypeInTargetAssembly={x:Type local:SearchBox}}}" />
-        <Setter Property="ListBoxStyle"
-                Value="{StaticResource {ComponentResourceKey ResourceId=ListBoxStyle, TypeInTargetAssembly={x:Type local:SearchBox}}}" />-->
+        <Setter Property="ItemsHeight"
+                Value="{Binding ActualHeight, RelativeSource={RelativeSource Self}, Mode=OneWay}" />
         <Setter Property="ItemsBackground"
                 Value="Transparent" />
         <Setter Property="ItemsForeground"

diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/SliderStyle.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/SliderStyle.xaml
@@ -37,6 +37,13 @@
                 Value="{Binding Path=(local:ShadowHelper.RenderingBias), RelativeSource={RelativeSource AncestorType=Slider}, Mode=OneWay}" />
         <Setter Property="local:ShadowHelper.ShadowDepth"
                 Value="{Binding Path=(local:ShadowHelper.ShadowDepth), RelativeSource={RelativeSource AncestorType=Slider}, Mode=OneWay}" />
+        <Style.Triggers>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+                <Setter Property="Opacity"
+                        Value="1" />
+            </Trigger>
+        </Style.Triggers>
     </Style>
 
     <Style x:Key="{x:Static rs:StyleKeys.SliderStyle}"

diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/TabControlStyle.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/TabControlStyle.xaml
@@ -7,6 +7,7 @@
                     xmlns:irs="clr-namespace:Panuon.WPF.UI.Internal.Resources">
     <ResourceDictionary.MergedDictionaries>
         <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Styles/ButtonStyle.xaml" />
+        <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Styles/TabItemStyle.xaml" />
         <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Templates/TabControlTemplate.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
@@ -35,6 +36,8 @@
 
     <Style x:Key="{x:Static rs:StyleKeys.TabControlStyle}"
            TargetType="TabControl">
+        <Setter Property="i:VisualStateHelper.Regist"
+                Value="True" />
         <Setter Property="local:IconHelper.FontFamily"
                 Value="{Binding IconFontFamily, Source={x:Static local:GlobalSettings.Setting}}" />
         <Setter Property="local:IconHelper.FontSize"
@@ -43,8 +46,6 @@
                 Value="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource Self}, Mode=OneWay}" />
         <Setter Property="local:IconHelper.Margin"
                 Value="5,0,0,0" />
-        <Setter Property="i:VisualStateHelper.Regist"
-                Value="True" />
         <Setter Property="i:VisualStateHelper.IsHover"
                 Value="{Binding IsMouseOver, RelativeSource={RelativeSource Self}, Mode=OneWay}" />
         <Setter Property="i:VisualStateHelper.IsSelected"
@@ -97,6 +98,8 @@
                 Value="Stretch" />
         <Setter Property="HorizontalContentAlignment"
                 Value="Stretch" />
+        <Setter Property="ItemContainerStyle"
+                Value="{StaticResource {x:Static rs:StyleKeys.TabItemStyle}}" />
         <Style.Triggers>
             <Trigger Property="TabStripPlacement"
                      Value="Top">

diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/TreeViewStyle.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Styles/TreeViewStyle.xaml
@@ -7,6 +7,7 @@
                     xmlns:irs="clr-namespace:Panuon.WPF.UI.Internal.Resources">
     <ResourceDictionary.MergedDictionaries>
         <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Styles/ToggleButtonStyle.xaml" />
+        <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Styles/TreeViewItemStyle.xaml" />
         <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Templates/TreeViewTemplate.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
@@ -91,6 +92,8 @@
                 Value="Transparent" />
         <Setter Property="VerticalContentAlignment"
                 Value="Center" />
+        <Setter Property="ItemContainerStyle"
+                Value="{StaticResource {x:Static rs:StyleKeys.TreeViewItemStyle}}" />
         <Setter Property="Template"
                 Value="{StaticResource {x:Static irs:TemplateKeys.TreeViewTemplate}}" />
         <Style.Triggers>

diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ColorPickerTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ColorPickerTemplate.xaml
@@ -112,9 +112,7 @@
                                 Command="{TemplateBinding ClearCommand}"
                                 CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=local:ColorPicker}}" />
                         <local:TransformControl Grid.Column="3"
-                                                Style="{TemplateBinding ToggleArrowTransformControlStyle}"
-                                                TextElement.Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource AncestorType=local:ColorPicker}, Mode=OneWay}"
-                                                TextBlock.Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource AncestorType=local:ColorPicker}, Mode=OneWay}" />
+                                                Style="{TemplateBinding ToggleArrowTransformControlStyle}" />
                     </Grid>
                 </ToggleButton>
             </local:ContentControlX>

diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ComboBoxTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ComboBoxTemplate.xaml
@@ -97,9 +97,7 @@
                                 Command="{Binding Path=(local:ComboBoxHelper.ClearCommand), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
                                 CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ComboBox}}" />
                         <local:TransformControl Grid.Column="2"
-                                                Style="{Binding Path=(local:ComboBoxHelper.ToggleArrowTransformControlStyle), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
-                                                TextElement.Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
-                                                TextBlock.Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}" />
+                                                Style="{Binding Path=(local:ComboBoxHelper.ToggleArrowTransformControlStyle), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}" />
                     </Grid>
                 </ToggleButton>
             </local:ContentControlX>
@@ -378,9 +376,7 @@
                                 Command="{Binding Path=(local:ComboBoxHelper.ClearCommand), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
                                 CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=ComboBox}}" />
                         <local:TransformControl Grid.Column="2"
-                                                Style="{Binding Path=(local:ComboBoxHelper.ToggleArrowTransformControlStyle), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
-                                                TextElement.Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}"
-                                                TextBlock.Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}" />
+                                                Style="{Binding Path=(local:ComboBoxHelper.ToggleArrowTransformControlStyle), RelativeSource={RelativeSource AncestorType=ComboBox}, Mode=OneWay}" />
                     </Grid>
                 </ToggleButton>
             </local:ContentControlX>

diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/DateTimePickerTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/DateTimePickerTemplate.xaml
@@ -91,9 +91,7 @@
                                 Command="{TemplateBinding ClearCommand}"
                                 CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=local:DateTimePicker}}" />
                         <local:TransformControl Grid.Column="2"
-                                                Style="{TemplateBinding ToggleArrowTransformControlStyle}"
-                                                TextElement.Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource AncestorType=local:DateTimePicker}, Mode=OneWay}"
-                                                TextBlock.Foreground="{Binding Path=(i:VisualStateHelper.Foreground), RelativeSource={RelativeSource AncestorType=local:DateTimePicker}, Mode=OneWay}" />
+                                                Style="{TemplateBinding ToggleArrowTransformControlStyle}" />
                     </Grid>
                 </ToggleButton>
             </local:ContentControlX>

diff --git a/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ListBoxTemplate.xaml b/SourceCode/SharedResources/Panuon.WPF.UI.Internal/Templates/ListBoxTemplate.xaml
@@ -63,7 +63,7 @@
                                VerticalContentAlignment="Stretch"
                                HorizontalContentAlignment="Stretch">
             <Grid>
-                <ItemsPresenter  x:Name="IpItems" />
+                <ItemsPresenter x:Name="IpItems" />
                 <ContentControl x:Name="CcEmpty"
                                 Visibility="Collapsed"
                                 Content="{Binding Path=(local:ListBoxHelper.EmptyContent), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />