From b29f59b603cb46731ea51120f9f138b760524755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=AB=E5=9F=8Evia?= <969954321@qq.com>
Date: Sat, 27 Nov 2021 21:22:51 +0800
Subject: [PATCH] pendingBox & improvements (#41)
New Properties:
TransformControl.RotateAngle
ComboBoxHelper.ItemsForeground
ExpanderHelper.HeaderBorderBrush
ExpanderHelper.HeaderBorderThickness
ExpanderHelper.ExpandedHeaderBorderBrush
ExpanderHelper.ExpandedHeaderBorderThickness
TabControlHelper.ItemsFontSize
TabControlHelper.ItemsFontFamily
TabControlHelper.ItemsRibbonLineMargin
TabControlHelper.ItemsSelectedFontSize
TabItemHelper.FontSize
TabItemHelper.FontFamily
TabItemHelper.RibbonLineMargin
TabItemHelper.SelectedFontSize
Rename:
TabControlHelper.ItemsHeaderHorizontalAlignment -> ItemsHorizontalAlignment
TabControlHelper.ItemsHeaderVerticalAlignment -> ItemsHorizontalAlignment
TabControlHelper.ItemsHeaderHorizontalContentAlignment -> ItemsHorizontalHeaderAlignment
TabControlHelper.ItemsHeaderVerticalContentAlignment -> ItemsHorizontalHeaderAlignment
Fixup:
Drawer might close unexpectedly when a popup in it closes.
---
DotNet/WPF/Src/Samples/App.xaml | 39 +++-
DotNet/WPF/Src/Samples/Views/MainView.xaml | 3 +
DotNet/WPF/Src/Samples/Views/MainView.xaml.cs | 10 +-
.../Controls/MessageBoxXWindow.cs | 57 ++---
.../Controls/PendingBoxWindow.cs | 210 ++++++++++++++++++
.../Implements/NoticeHandlerImpl.cs | 4 +-
.../Implements/PendingHandlerImpl.cs | 64 ++++++
.../Panuon.UI.Silver.Internal.projitems | 6 +
.../Styles/ComboBoxItemStyle.xaml | 2 +
.../Styles/ComboBoxStyle.xaml | 2 +
.../Styles/MessageBoxXStyle.xaml | 2 +-
.../Styles/PendingBoxStyle.xaml | 112 ++++++++++
.../Styles/TabControlStyle.xaml | 12 +-
.../Styles/TabItemStyle.xaml | 20 +-
.../Templates/ExpanderTemplate.xaml | 32 ++-
.../Templates/TabItemTemplate.xaml | 26 ++-
.../Utils/Win32Util.cs | 8 +-
.../Configurations/NoticeBoxSetting.cs | 2 +-
.../Configurations/PendingBoxSetting.cs | 98 ++++++++
.../Contracts/IPendingHandler.cs | 16 ++
.../Panuon.UI.Silver/Controls/Drawer.cs | 7 +-
.../Controls/TransformControl.cs | 30 +++
.../Helpers/ComboBoxHelper.cs | 16 ++
.../Helpers/ExpanderHelper.cs | 60 +++++
.../Panuon.UI.Silver/Helpers/NoticeBox.cs | 7 +-
.../Panuon.UI.Silver/Helpers/PendingBox.cs | 123 ++++++++++
.../Helpers/PendingBoxSettings.cs | 100 +++++++++
.../Helpers/TabControlHelper.cs | 124 ++++++++---
.../Panuon.UI.Silver/Helpers/TabItemHelper.cs | 91 ++++++--
.../Panuon.UI.Silver.projitems | 4 +
.../Panuon.UI.Silver/Themes/Generic.Core.xaml | 1 +
31 files changed, 1165 insertions(+), 123 deletions(-)
create mode 100644 DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Controls/PendingBoxWindow.cs
create mode 100644 DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Implements/PendingHandlerImpl.cs
create mode 100644 DotNet/WPF/Src/SharedResources/Panuon.UI.Silver.Internal/Styles/PendingBoxStyle.xaml
create mode 100644 DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Configurations/PendingBoxSetting.cs
create mode 100644 DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Contracts/IPendingHandler.cs
create mode 100644 DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/PendingBox.cs
create mode 100644 DotNet/WPF/Src/SharedResources/Panuon.UI.Silver/Helpers/PendingBoxSettings.cs
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}">