未验证 提交 11da373e 编写于 作者: 末城via 提交者: GitHub

1.1.11.8 (#166)

* 1.1.11.8
上级 6b5aa1d2
......@@ -4,7 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Samples.Views"
xmlns:pu="https://opensource.panuon.com/wpf-ui"
xmlns:pui="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI"
mc:Ignorable="d"
Title="MainView"
Height="600"
......
......@@ -701,7 +701,4 @@
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Folder Include="$(MSBuildThisFileDirectory)Attributes\" />
</ItemGroup>
</Project>
\ No newline at end of file
......@@ -194,3 +194,8 @@
</ResourceDictionary>
<DataTrigger Binding="{Binding Path=(local:ButtonHelper.ClickBackground), Converter={StaticResource {x:Static rs:ConverterKeys.IsNonnullConverter}}, RelativeSource={RelativeSource Self}, Mode=OneWay}"
Value="True" />
<Setter Property="Background"
Value="{Binding Path=(local:ButtonHelper.ClickBackground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
</DataTrigger>
\ No newline at end of file
......@@ -12,7 +12,6 @@
<ControlTemplate x:Key="{x:Static irs:TemplateKeys.LabelTemplate}"
TargetType="Label">
<Border x:Name="BdrContainer"
i:VisualStateHelper.IsClickEffectPressed="{Binding IsPressed, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
Padding="{TemplateBinding Padding}"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
......
......@@ -12,7 +12,6 @@
<ControlTemplate x:Key="{x:Static irs:TemplateKeys.ToolTipTemplate}"
TargetType="ToolTip">
<Border x:Name="BdrContainer"
i:VisualStateHelper.IsClickEffectPressed="{Binding IsPressed, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
Padding="{TemplateBinding Padding}"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
......
......@@ -140,7 +140,7 @@ namespace Panuon.WPF.UI
}
public static readonly DependencyProperty ShadowColorProperty =
DependencyProperty.Register("ShadowColor", typeof(Color?), typeof(MultiComboBox));
VisualStateHelper.ShadowColorProperty.AddOwner(typeof(MultiComboBox));
#endregion
#region CornerRadius
......
......@@ -9,7 +9,7 @@ using System.Windows.Markup;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Panuon.WPF.UI")]
[assembly: AssemblyCopyright("Copyright ©2018-2022 Panuon Group (open source orgnization).")]
[assembly: AssemblyCopyright("Copyright ©2018-2023 Panuon Group (open source orgnization).")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
......@@ -25,5 +25,5 @@ using System.Windows.Markup;
ResourceDictionaryLocation.SourceAssembly
)]
[assembly: AssemblyVersion("1.1.11.7")]
[assembly: AssemblyFileVersion("1.1.11.7")]
\ No newline at end of file
[assembly: AssemblyVersion("1.1.11.8")]
[assembly: AssemblyFileVersion("1.1.11.8")]
\ No newline at end of file
......@@ -65,13 +65,12 @@ xmlns:pu="https://opensource.panuon.com/wpf-ui"
```
```
xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI"
xmlns:purs="clr-namespace:Panuon.WPF.UI.Resources;assembly=Panuon.WPF.UI"
xmlns:pu="https://opensource.panuon.com/wpf-ui"
...
<Button Width="150"
Height="35"
Style="{StaticResource {x:Static purs:StyleKeys.ButtonStyle}}"
Style="{StaticResource {x:Static pu:StyleKeys.ButtonStyle}}"
Background="#6CBCEA"
pu:ButtonHelper.CornerRadius="5"
pu:ButtonHelper.HoverBackground="#6CA3EA"
......
......@@ -65,13 +65,12 @@ xmlns:pu="https://opensource.panuon.com/wpf-ui"
```
```
xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI"
xmlns:purs="clr-namespace:Panuon.WPF.UI.Resources;assembly=Panuon.WPF.UI"
xmlns:pu="https://opensource.panuon.com/wpf-ui"
...
<Button Width="150"
Height="35"
Style="{StaticResource {x:Static purs:StyleKeys.ButtonStyle}}"
Style="{StaticResource {x:Static pu:StyleKeys.ButtonStyle}}"
Background="#6CBCEA"
pu:ButtonHelper.CornerRadius="5"
pu:ButtonHelper.HoverBackground="#6CA3EA"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册