diff --git a/DotNet/WPF/Src/Samples/App.xaml b/DotNet/WPF/Src/Samples/App.xaml
index 6a5bcc02..b4e08c56 100644
--- a/DotNet/WPF/Src/Samples/App.xaml
+++ b/DotNet/WPF/Src/Samples/App.xaml
@@ -9,20 +9,20 @@
-
-
+
+
@@ -30,6 +30,35 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/DotNet/WPF/Src/Samples/Views/MainView.xaml b/DotNet/WPF/Src/Samples/Views/MainView.xaml
index 686a4c4a..3ccaee4b 100644
--- a/DotNet/WPF/Src/Samples/Views/MainView.xaml
+++ b/DotNet/WPF/Src/Samples/Views/MainView.xaml
@@ -48,6 +48,9 @@
+
(this, OKButtonTemplateName);
- if (_okButton == null)
+ if (_okButton != null)
{
- throw new Exception($"MessageBoxXSetting : Can not find Button named {OKButtonTemplateName} in ContentTemplate property.");
+ _okButton.Content = _setting.OKButtonContent;
+ _okButton.Visibility = (_messageBoxButton == MessageBoxButton.OK || _messageBoxButton == MessageBoxButton.OKCancel) ? Visibility.Visible : Visibility.Collapsed;
+ _okButton.IsDefault = (_defaultButton == DefaultButton.YesOK && _messageBoxButton == MessageBoxButton.OK);
+ _okButton.Tag = "OK";
+ _okButton.Click += Button_Click;
}
_cancelButton = FrameworkElementUtil.FindVisualChild
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/TabControlStyle.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/TabControlStyle.xaml
index 28ffc645..718cbbba 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/TabControlStyle.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/TabControlStyle.xaml
@@ -55,18 +55,22 @@
Value="1" />
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+ Value="{Binding Path=(local:TabControlHelper.ItemsVerticalAlignment), RelativeSource={RelativeSource AncestorType=TabControl}, Mode=OneWay}" />
+ Value="{Binding Path=(local:TabControlHelper.ItemsHorizontalAlignment), RelativeSource={RelativeSource AncestorType=TabControl}, Mode=OneWay}" />
diff --git a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ExpanderTemplate.xaml b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ExpanderTemplate.xaml
index f05433ae..f0b22f93 100644
--- a/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ExpanderTemplate.xaml
+++ b/DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Templates/ExpanderTemplate.xaml
@@ -31,6 +31,8 @@
-
+
@@ -153,6 +157,28 @@
Property="Foreground"
Value="{Binding Path=(local:ExpanderHelper.ExpandedHeaderForeground), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ VerticalContentAlignment="{Binding Path=(local:ExpanderHelper.VerticalHeaderAlignment), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+ HorizontalContentAlignment="{Binding Path=(local:ExpanderHelper.HorizontalHeaderAlignment), RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">