From fff43a84ac760bcc0685051b699f1bf85231b60d Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Fri, 2 Aug 2019 00:15:06 +0800
Subject: [PATCH 01/11] upgraded growl
---
.../HandyControl_Net_40.csproj | 4 -
.../Themes/Styles/Growl.xaml | 62 -----
.../HandyControl_Net_GE45.csproj | 4 -
.../Themes/Styles/Growl.xaml | 62 -----
.../HandyControlDemo_Shared/App.xaml.cs | 1 +
.../HandyControlDemo_Shared.projitems | 7 -
.../UserControl/Controls/GrowlDemoCtl.xaml | 33 ++-
.../Controls/RelativePanelDemoCtl.xaml | 6 -
.../Controls/RelativePanelDemoCtl.xaml.cs | 10 -
.../ViewModel/Controls/GrowlDemoViewModel.cs | 52 +++-
.../Window/GrowlDemoWindow.xaml | 2 +-
.../Controls/{Other => Growl}/Growl.cs | 239 +++++++++++++++++-
.../Controls/Growl/GrowlWindow.cs | 47 ++++
.../HandyControl_Shared.projitems | 10 +-
.../Themes/Styles/Growl.xaml | 18 ++
15 files changed, 385 insertions(+), 172 deletions(-)
delete mode 100644 src/Net_40/HandyControl_Net_40/Themes/Styles/Growl.xaml
delete mode 100644 src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Growl.xaml
delete mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Controls/RelativePanelDemoCtl.xaml
delete mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Controls/RelativePanelDemoCtl.xaml.cs
rename src/Shared/HandyControl_Shared/Controls/{Other => Growl}/Growl.cs (71%)
create mode 100644 src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs
rename src/{Core_30/HandyControl_Core_30 => Shared/HandyControl_Shared}/Themes/Styles/Growl.xaml (85%)
diff --git a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
index 0ea83fbe..059b6816 100644
--- a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
+++ b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
@@ -69,10 +69,6 @@
Designer
XamlIntelliSenseFileGenerator
-
- Designer
- XamlIntelliSenseFileGenerator
-
Designer
XamlIntelliSenseFileGenerator
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Growl.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Growl.xaml
deleted file mode 100644
index d28b4fa2..00000000
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Growl.xaml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
index d608122e..fbae7bb8 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
@@ -138,10 +138,6 @@
Designer
XamlIntelliSenseFileGenerator
-
- Designer
- XamlIntelliSenseFileGenerator
-
Designer
XamlIntelliSenseFileGenerator
diff --git a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Growl.xaml b/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Growl.xaml
deleted file mode 100644
index d28b4fa2..00000000
--- a/src/Net_GE45/HandyControl_Net_GE45/Themes/Styles/Growl.xaml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/App.xaml.cs b/src/Shared/HandyControlDemo_Shared/App.xaml.cs
index 08ba9c5b..c41eb5c8 100644
--- a/src/Shared/HandyControlDemo_Shared/App.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/App.xaml.cs
@@ -18,6 +18,7 @@ namespace HandyControlDemo
{
base.OnStartup(e);
+ ShutdownMode = ShutdownMode.OnMainWindowClose;
GlobalData.Init();
ConfigHelper.Instance.SetLang(GlobalData.Config.Lang);
diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
index 8c3ece37..6492d068 100644
--- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
+++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
@@ -63,9 +63,6 @@
RangeSliderDemoCtl.xaml
-
- RelativePanelDemoCtl.xaml
-
BadgeDemoCtl.xaml
@@ -434,10 +431,6 @@
Designer
MSBuild:Compile
-
- Designer
- MSBuild:Compile
-
Designer
MSBuild:Compile
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GrowlDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GrowlDemoCtl.xaml
index 5d229ef7..3d06771c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GrowlDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GrowlDemoCtl.xaml
@@ -7,16 +7,29 @@
Background="{DynamicResource RegionBrush}">
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RelativePanelDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RelativePanelDemoCtl.xaml
deleted file mode 100644
index 50fa38b9..00000000
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RelativePanelDemoCtl.xaml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RelativePanelDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RelativePanelDemoCtl.xaml.cs
deleted file mode 100644
index 39b53914..00000000
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RelativePanelDemoCtl.xaml.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace HandyControlDemo.UserControl
-{
- public partial class RelativePanelDemoCtl
- {
- public RelativePanelDemoCtl()
- {
- InitializeComponent();
- }
- }
-}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/GrowlDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/GrowlDemoViewModel.cs
index c40bab23..2685093b 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/GrowlDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/GrowlDemoViewModel.cs
@@ -25,6 +25,8 @@ namespace HandyControlDemo.ViewModel
_token = token;
}
+ #region Window
+
public RelayCommand InfoCmd => new Lazy(() =>
new RelayCommand(() => Growl.Info(Properties.Langs.Lang.GrowlInfo, _token))).Value;
@@ -47,14 +49,14 @@ namespace HandyControlDemo.ViewModel
public RelayCommand ErrorCmd => new Lazy(() =>
new RelayCommand(() => Growl.Error(Properties.Langs.Lang.GrowlError, _token))).Value;
- public RelayCommand AskCmd => new Lazy(() =>
+ public RelayCommand AskCmd => new Lazy(() =>
new RelayCommand(() => Growl.Ask(Properties.Langs.Lang.GrowlAsk, isConfirmed =>
{
Growl.Info(isConfirmed.ToString());
return true;
}, _token))).Value;
- public RelayCommand FatalCmd => new Lazy(() =>
+ public RelayCommand FatalCmd => new Lazy(() =>
new RelayCommand(() => Growl.Fatal(new GrowlInfo
{
Message = Properties.Langs.Lang.GrowlFatal,
@@ -63,7 +65,51 @@ namespace HandyControlDemo.ViewModel
}))).Value;
public RelayCommand ClearCmd => new Lazy(() =>
- new RelayCommand(() => Growl.Clear())).Value;
+ new RelayCommand(() => Growl.Clear(_token))).Value;
+
+ #endregion
+
+ #region Desktop
+
+ public RelayCommand InfoGlobalCmd => new Lazy(() =>
+ new RelayCommand(() => Growl.InfoGlobal(Properties.Langs.Lang.GrowlInfo))).Value;
+
+ public RelayCommand SuccessGlobalCmd => new Lazy(() =>
+ new RelayCommand(() => Growl.SuccessGlobal(Properties.Langs.Lang.GrowlSuccess))).Value;
+
+ public RelayCommand WarningGlobalCmd => new Lazy(() =>
+ new RelayCommand(() => Growl.WarningGlobal(new GrowlInfo
+ {
+ Message = Properties.Langs.Lang.GrowlWarning,
+ CancelStr = Properties.Langs.Lang.Ignore,
+ ActionBeforeClose = isConfirmed =>
+ {
+ Growl.InfoGlobal(isConfirmed.ToString());
+ return true;
+ }
+ }))).Value;
+
+ public RelayCommand ErrorGlobalCmd => new Lazy(() =>
+ new RelayCommand(() => Growl.ErrorGlobal(Properties.Langs.Lang.GrowlError))).Value;
+
+ public RelayCommand AskGlobalCmd => new Lazy(() =>
+ new RelayCommand(() => Growl.AskGlobal(Properties.Langs.Lang.GrowlAsk, isConfirmed =>
+ {
+ Growl.InfoGlobal(isConfirmed.ToString());
+ return true;
+ }))).Value;
+
+ public RelayCommand FatalGlobalCmd => new Lazy(() =>
+ new RelayCommand(() => Growl.FatalGlobal(new GrowlInfo
+ {
+ Message = Properties.Langs.Lang.GrowlFatal,
+ ShowDateTime = false
+ }))).Value;
+
+ public RelayCommand ClearGlobalCmd => new Lazy(() =>
+ new RelayCommand(Growl.ClearGlobal)).Value;
+
+ #endregion
public RelayCommand NewWindowCmd => new Lazy(() =>
new RelayCommand(() => new GrowlDemoWindow
diff --git a/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml b/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml
index 9a329f26..99f46bf7 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml
@@ -15,7 +15,7 @@
-
+
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Growl.cs b/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs
similarity index 71%
rename from src/Shared/HandyControl_Shared/Controls/Other/Growl.cs
rename to src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs
index 789fb7c3..8e285916 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Growl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs
@@ -31,6 +31,8 @@ namespace HandyControl.Controls
#region Data
+ private static GrowlWindow GrowlWindow;
+
private Panel _panelMore;
private Grid _gridMain;
@@ -293,6 +295,8 @@ namespace HandyControl.Controls
private static void InitGrowlPanel(Panel panel)
{
+ if (panel == null) return;
+
var menuItem = new MenuItem
{
Header = Properties.Langs.Lang.Clear
@@ -334,6 +338,61 @@ namespace HandyControl.Controls
if (!_staysOpen) StartTimer();
}
+ private static void ShowGlobal(GrowlInfo growlInfo)
+ {
+ if (GrowlWindow == null)
+ {
+ GrowlWindow = new GrowlWindow();
+ GrowlWindow.Show();
+ InitGrowlPanel(GrowlWindow.GrowlPanel);
+ GrowlWindow.Init();
+ }
+
+ GrowlWindow.Show(true);
+
+#if netle40
+ Application.Current.Dispatcher?.Invoke(new Action(() =>
+ {
+ var ctl = new Growl
+ {
+ Message = growlInfo.Message,
+ Time = DateTime.Now,
+ Icon = ResourceHelper.GetResource(growlInfo.IconKey),
+ IconBrush = ResourceHelper.GetResource(growlInfo.IconBrushKey),
+ _showCloseButton = growlInfo.ShowCloseButton,
+ ActionBeforeClose = growlInfo.ActionBeforeClose,
+ _staysOpen = growlInfo.StaysOpen,
+ ShowDateTime = growlInfo.ShowDateTime,
+ ConfirmStr = growlInfo.ConfirmStr,
+ CancelStr = growlInfo.CancelStr,
+ Type = growlInfo.Type,
+ _waitTime = Math.Max(growlInfo.WaitTime, 2)
+ };
+ GrowlWindow.GrowlPanel.Children.Insert(0, ctl);
+ }));
+#else
+ Application.Current.Dispatcher?.Invoke(() =>
+ {
+ var ctl = new Growl
+ {
+ Message = growlInfo.Message,
+ Time = DateTime.Now,
+ Icon = ResourceHelper.GetResource(growlInfo.IconKey),
+ IconBrush = ResourceHelper.GetResource(growlInfo.IconBrushKey),
+ _showCloseButton = growlInfo.ShowCloseButton,
+ ActionBeforeClose = growlInfo.ActionBeforeClose,
+ _staysOpen = growlInfo.StaysOpen,
+ ShowDateTime = growlInfo.ShowDateTime,
+ ConfirmStr = growlInfo.ConfirmStr,
+ CancelStr = growlInfo.CancelStr,
+ Type = growlInfo.Type,
+ _waitTime = Math.Max(growlInfo.WaitTime, 2)
+ };
+ GrowlWindow.GrowlPanel.Children.Insert(0, ctl);
+ });
+#endif
+ }
+
///
/// 显示信息
///
@@ -341,7 +400,7 @@ namespace HandyControl.Controls
private static void Show(GrowlInfo growlInfo)
{
#if netle40
- Application.Current.Dispatcher.Invoke(new Action(() =>
+ Application.Current.Dispatcher?.Invoke(new Action(() =>
{
var ctl = new Growl
{
@@ -371,7 +430,7 @@ namespace HandyControl.Controls
}
}));
#else
- Application.Current.Dispatcher.Invoke(() =>
+ Application.Current.Dispatcher?.Invoke(() =>
{
var ctl = new Growl
{
@@ -430,6 +489,31 @@ namespace HandyControl.Controls
Show(growlInfo);
}
+ ///
+ /// 成功
+ ///
+ ///
+ public static void SuccessGlobal(string message) => SuccessGlobal(new GrowlInfo
+ {
+ Message = message
+ });
+
+ ///
+ /// 成功
+ ///
+ ///
+ public static void SuccessGlobal(GrowlInfo growlInfo)
+ {
+ if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
+ if (!growlInfo.IsCustom)
+ {
+ growlInfo.IconKey = ResourceToken.SuccessGeometry;
+ growlInfo.IconBrushKey = ResourceToken.SuccessBrush;
+ growlInfo.Type = InfoType.Success;
+ }
+ ShowGlobal(growlInfo);
+ }
+
///
/// 消息
///
@@ -457,6 +541,31 @@ namespace HandyControl.Controls
Show(growlInfo);
}
+ ///
+ /// 消息
+ ///
+ ///
+ public static void InfoGlobal(string message) => InfoGlobal(new GrowlInfo
+ {
+ Message = message
+ });
+
+ ///
+ /// 消息
+ ///
+ ///
+ public static void InfoGlobal(GrowlInfo growlInfo)
+ {
+ if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
+ if (!growlInfo.IsCustom)
+ {
+ growlInfo.IconKey = ResourceToken.InfoGeometry;
+ growlInfo.IconBrushKey = ResourceToken.InfoBrush;
+ growlInfo.Type = InfoType.Info;
+ }
+ ShowGlobal(growlInfo);
+ }
+
///
/// 警告
///
@@ -484,6 +593,31 @@ namespace HandyControl.Controls
Show(growlInfo);
}
+ ///
+ /// 警告
+ ///
+ ///
+ public static void WarningGlobal(string message) => WarningGlobal(new GrowlInfo
+ {
+ Message = message
+ });
+
+ ///
+ /// 警告
+ ///
+ ///
+ public static void WarningGlobal(GrowlInfo growlInfo)
+ {
+ if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
+ if (!growlInfo.IsCustom)
+ {
+ growlInfo.IconKey = ResourceToken.WarningGeometry;
+ growlInfo.IconBrushKey = ResourceToken.WarningBrush;
+ growlInfo.Type = InfoType.Warning;
+ }
+ ShowGlobal(growlInfo);
+ }
+
///
/// 错误
///
@@ -512,6 +646,32 @@ namespace HandyControl.Controls
Show(growlInfo);
}
+ ///
+ /// 错误
+ ///
+ ///
+ public static void ErrorGlobal(string message) => ErrorGlobal(new GrowlInfo
+ {
+ Message = message
+ });
+
+ ///
+ /// 错误
+ ///
+ ///
+ public static void ErrorGlobal(GrowlInfo growlInfo)
+ {
+ if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
+ if (!growlInfo.IsCustom)
+ {
+ growlInfo.IconKey = ResourceToken.ErrorGeometry;
+ growlInfo.IconBrushKey = ResourceToken.DangerBrush;
+ growlInfo.StaysOpen = true;
+ growlInfo.Type = InfoType.Error;
+ }
+ ShowGlobal(growlInfo);
+ }
+
///
/// 严重
///
@@ -542,6 +702,34 @@ namespace HandyControl.Controls
Show(growlInfo);
}
+ ///
+ /// 严重
+ ///
+ ///
+ public static void FatalGlobal(string message) => FatalGlobal(new GrowlInfo
+ {
+ Message = message
+ });
+
+ ///
+ /// 严重
+ ///
+ ///
+ public static void FatalGlobal(GrowlInfo growlInfo)
+ {
+ if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
+ if (!growlInfo.IsCustom)
+ {
+ growlInfo.IconKey = ResourceToken.FatalGeometry;
+ growlInfo.IconBrushKey = ResourceToken.PrimaryTextBrush;
+ growlInfo.StaysOpen = true;
+ growlInfo.ShowCloseButton = false;
+ growlInfo.Type = InfoType.Fatal;
+ if (GrowlPanel.ContextMenu != null) GrowlPanel.ContextMenu.Opacity = 0;
+ }
+ ShowGlobal(growlInfo);
+ }
+
///
/// 询问
///
@@ -573,6 +761,35 @@ namespace HandyControl.Controls
Show(growlInfo);
}
+ ///
+ /// 询问
+ ///
+ ///
+ ///
+ public static void AskGlobal(string message, Func actionBeforeClose) => AskGlobal(new GrowlInfo
+ {
+ Message = message,
+ ActionBeforeClose = actionBeforeClose
+ });
+
+ ///
+ /// 询问
+ ///
+ ///
+ public static void AskGlobal(GrowlInfo growlInfo)
+ {
+ if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
+ if (!growlInfo.IsCustom)
+ {
+ growlInfo.IconKey = ResourceToken.AskGeometry;
+ growlInfo.IconBrushKey = ResourceToken.AccentBrush;
+ growlInfo.StaysOpen = true;
+ growlInfo.ShowCloseButton = false;
+ growlInfo.Type = InfoType.Ask;
+ }
+ ShowGlobal(growlInfo);
+ }
+
private void ButtonClose_OnClick(object sender, RoutedEventArgs e) => Close();
///
@@ -589,6 +806,12 @@ namespace HandyControl.Controls
if (Parent is Panel panel)
{
panel.Children.Remove(this);
+
+ if (GrowlWindow?.GrowlPanel != null && GrowlWindow.GrowlPanel.Children.Count == 0)
+ {
+ GrowlWindow.Close();
+ GrowlWindow = null;
+ }
}
};
transform.BeginAnimation(TranslateTransform.XProperty, animation);
@@ -619,6 +842,7 @@ namespace HandyControl.Controls
///
private static void Clear(Panel panel)
{
+ if (panel == null) return;
panel.Children.Clear();
if (panel.ContextMenu != null)
{
@@ -627,6 +851,17 @@ namespace HandyControl.Controls
}
}
+ ///
+ /// 清除
+ ///
+ public static void ClearGlobal()
+ {
+ if (GrowlWindow == null) return;
+ Clear(GrowlWindow.GrowlPanel);
+ GrowlWindow.Close();
+ GrowlWindow = null;
+ }
+
private void ButtonCancel_OnClick(object sender, RoutedEventArgs e)
{
if (ActionBeforeClose?.Invoke(false) == true)
diff --git a/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs b/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs
new file mode 100644
index 00000000..a341abbc
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Interop;
+using HandyControl.Tools.Interop;
+
+namespace HandyControl.Controls
+{
+ [TemplatePart(Name = ElementGrowPanel, Type = typeof(Panel))]
+ internal class GrowlWindow : Window
+ {
+ private const string ElementGrowPanel = "PART_GrowPanel";
+
+ public Panel GrowlPanel { get; set; }
+
+ public GrowlWindow()
+ {
+ WindowStyle = WindowStyle.None;
+ AllowsTransparency = true;
+ }
+
+ public override void OnApplyTemplate()
+ {
+ base.OnApplyTemplate();
+
+ GrowlPanel = GetTemplateChild(ElementGrowPanel) as Panel;
+ }
+
+ protected override void OnSourceInitialized(EventArgs e)
+ {
+ base.OnSourceInitialized(e);
+
+ var _ = new WindowInteropHelper(this)
+ {
+ Owner = NativeMethods.GetDesktopWindow()
+ };
+ }
+
+ public void Init()
+ {
+ var desktopWorkingArea = SystemParameters.WorkArea;
+ Height = desktopWorkingArea.Height;
+ Left = desktopWorkingArea.Right - Width;
+ Top = 0;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index bfb0b9f6..eb5081d3 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -19,6 +19,7 @@
+
@@ -82,7 +83,7 @@
-
+
@@ -385,6 +386,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ XamlIntelliSenseFileGenerator
+
Designer
MSBuild:Compile
@@ -810,4 +815,7 @@
MSBuild:Compile
+
+
+
\ No newline at end of file
diff --git a/src/Core_30/HandyControl_Core_30/Themes/Styles/Growl.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Growl.xaml
similarity index 85%
rename from src/Core_30/HandyControl_Core_30/Themes/Styles/Growl.xaml
rename to src/Shared/HandyControl_Shared/Themes/Styles/Growl.xaml
index d28b4fa2..9fd38d69 100644
--- a/src/Core_30/HandyControl_Core_30/Themes/Styles/Growl.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Growl.xaml
@@ -10,6 +10,24 @@
+
+
+
+xaml中的使用：
+
+
+
+
+
+
+
+
+{% endcode %}
+
+效果如下：
+
+
+
+{% endnode %}
diff --git a/doc/source/handycontrol/native_controls/images/DataGrid-Warning01.png b/doc/source/handycontrol/native_controls/images/DataGrid-Warning01.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1d39abe8f5d84797393de30bcbd9a7de33ff718
GIT binary patch
literal 4238
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
literal 0
HcmV?d00001
From 95a8241bb00b2cb35d9b6730887cf3711bb2e3c8 Mon Sep 17 00:00:00 2001
From: guanguanchuangyu <3246907890@qq.com>
Date: Sun, 4 Aug 2019 16:10:55 +0800
Subject: [PATCH 03/11] ggcy-add warning info of DataGrid
---
.../native_controls/dataGrid/index.md | 45 +++++++++++++++++-
.../images/DataGrid-Warning01.png | Bin 0 -> 4238 bytes
2 files changed, 44 insertions(+), 1 deletion(-)
create mode 100644 doc/source/handycontrol/native_controls/images/DataGrid-Warning01.png
diff --git a/doc/source/handycontrol/native_controls/dataGrid/index.md b/doc/source/handycontrol/native_controls/dataGrid/index.md
index 7ea36f18..6733d645 100644
--- a/doc/source/handycontrol/native_controls/dataGrid/index.md
+++ b/doc/source/handycontrol/native_controls/dataGrid/index.md
@@ -2,6 +2,19 @@
title: DataGrid 数据表格
---
+**HandyControl中自带DataGrid相关样式**
+
+| style名称 | 所属类型 | 用途描述 |
+| :------------------------ | :------------------------------------------ | :----------------------------------------------------- |
+| RowHeaderGripperStyle | Thumb | RowHeader的可拖拽样式 |
+| ColumnHeaderGripperStyle | Thumb | ColumnHeader可拖拽样式 |
+| DataGridCellStyle | DataGridCell | DataGrid数据列样式 |
+| DataGridRowStyle | DataGridRow | DataGrid数据行样式 |
+| DataGridColumnHeaderStyle | DataGridColumnHeader | DataGrid列头样式 |
+| DataGridRowHeaderStyle | DataGridRowHeader | DataGrid行头样式 |
+| TextBlockComboBoxStyle | controls:DataGridAttach.ComboBoxColumnStyle | DataGrid附加属性文本框下拉列的非编辑模式下文本显示样式 |
+| DataGridTextColumnStyle | TextBlock | DataGrid文本列样式 |
+
{% note info no-icon %}
用例：
@@ -29,4 +42,34 @@ title: DataGrid 数据表格
{% endcode %}
-{% endnote %}
\ No newline at end of file
+{% endnote %}
+
+**常见问题：**
+{% note warning no-icon%}
+对于文本显示列`DataGridTextColumn`需要设定文本内容`水平居中`或者`水平居右`，而不是HandyControl中设定的样式默认显示为`居左`时，需要继承`DataGridCellStyle`重写`HorizontalContentAlignment` 属性为`Center` 或`Right` 需要注意的是，此方式仅仅使用与引入了HandControl资源样式的项目，普通原生DataGrid使用该方式无效。
+
+用例如下：
+
+{% code %}
+
+样式：
+
+
+xaml中的使用：
+
+
+
+
+
+
+
+
+{% endcode %}
+
+效果如下：
+
+
+
+{% endnote %}
diff --git a/doc/source/handycontrol/native_controls/images/DataGrid-Warning01.png b/doc/source/handycontrol/native_controls/images/DataGrid-Warning01.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1d39abe8f5d84797393de30bcbd9a7de33ff718
GIT binary patch
literal 4238
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
literal 0
HcmV?d00001
From 359703d5204fbbf935ff42819685ce9a8c9c2518 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 5 Aug 2019 21:38:10 +0800
Subject: [PATCH 04/11] Update index.md
---
.../native_controls/dataGrid/index.md | 36 +++++++++----------
1 file changed, 16 insertions(+), 20 deletions(-)
diff --git a/doc/source/handycontrol/native_controls/dataGrid/index.md b/doc/source/handycontrol/native_controls/dataGrid/index.md
index 5c66a7a7..093d0e09 100644
--- a/doc/source/handycontrol/native_controls/dataGrid/index.md
+++ b/doc/source/handycontrol/native_controls/dataGrid/index.md
@@ -2,18 +2,18 @@
title: DataGrid 数据表格
---
-**HandyControl中自带DataGrid相关样式**
+# 相关样式
-| style名称 | 所属类型 | 用途描述 |
-| :------------------------ | :------------------------------------------ | :----------------------------------------------------- |
-| RowHeaderGripperStyle | Thumb | RowHeader的可拖拽样式 |
-| ColumnHeaderGripperStyle | Thumb | ColumnHeader可拖拽样式 |
-| DataGridCellStyle | DataGridCell | DataGrid数据列样式 |
-| DataGridRowStyle | DataGridRow | DataGrid数据行样式 |
-| DataGridColumnHeaderStyle | DataGridColumnHeader | DataGrid列头样式 |
-| DataGridRowHeaderStyle | DataGridRowHeader | DataGrid行头样式 |
-| TextBlockComboBoxStyle | controls:DataGridAttach.ComboBoxColumnStyle | DataGrid附加属性文本框下拉列的非编辑模式下文本显示样式 |
-| DataGridTextColumnStyle | TextBlock | DataGrid文本列样式 |
+| style名称 | 所属类型 | 用途描述 |
+| - | - | - |
+| RowHeaderGripperStyle | Thumb | 行标题拖拽条样式 |
+| ColumnHeaderGripperStyle | Thumb | 列标题拖拽条样式 |
+| DataGridCellStyle | DataGridCell | 单元格样式 |
+| DataGridRowStyle | DataGridRow | 行样式 |
+| DataGridColumnHeaderStyle | DataGridColumnHeader | 列标题样式 |
+| DataGridRowHeaderStyle | DataGridRowHeader | 行标题样式 |
+| TextBlockComboBoxStyle | ComboBox | ComboBox非编辑模式样式 |
+| DataGridTextColumnStyle | TextBlock | 默认文本样式 |
{% note info no-icon %}
用例：
@@ -44,7 +44,7 @@ title: DataGrid 数据表格
{% endnote %}
-**常见问题：**
+# FAQ
{% note warning no-icon%}
对于文本显示列`DataGridTextColumn`需要设定文本内容`水平居中`或者`水平居右`，而不是HandyControl中设定的样式默认显示为`居左`时，需要继承`DataGridCellStyle`重写`HorizontalContentAlignment` 属性为`Center` 或`Right` 需要注意的是，此方式仅仅适用于引入了HandControl资源样式的项目，普通原生DataGrid使用该方式无效。
@@ -63,14 +63,10 @@ title: DataGrid 数据表格
xaml中的使用：
-
-
-
-
-
-
-
-
+
+
+
+
{% endcode %}
From 0f2cb24a3be00095128f8f9bd6e83554e6d3aa74 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 7 Aug 2019 22:58:26 +0800
Subject: [PATCH 05/11] Update NumericUpDown.cs
---
.../Controls/Input/NumericUpDown.cs | 29 ++++++++++++-------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
index 5f8f3f48..f4b8aa78 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
@@ -1,6 +1,7 @@
using System;
using System.Windows;
using System.Windows.Controls;
+using System.Windows.Documents;
using System.Windows.Input;
using HandyControl.Data;
using HandyControl.Interactivity;
@@ -65,7 +66,8 @@ namespace HandyControl.Controls
{
if (_textBox != null)
{
- _textBox.TextChanged -= TextBox_TextChanged;
+ TextCompositionManager.RemovePreviewTextInputHandler(_textBox, PreviewTextInputHandler);
+ _textBox.TextChanged -= _textBox_TextChanged;
_textBox.PreviewKeyDown -= TextBox_PreviewKeyDown;
_textBox.LostFocus -= TextBox_LostFocus;
}
@@ -76,13 +78,27 @@ namespace HandyControl.Controls
if (_textBox != null)
{
- _textBox.TextChanged += TextBox_TextChanged;
+ TextCompositionManager.AddPreviewTextInputHandler(_textBox, PreviewTextInputHandler);
+ _textBox.TextChanged += _textBox_TextChanged;
_textBox.PreviewKeyDown += TextBox_PreviewKeyDown;
_textBox.LostFocus += TextBox_LostFocus;
_textBox.Text = CurrentText;
}
}
+ private void _textBox_TextChanged(object sender, TextChangedEventArgs e) => UpdateData();
+
+ private void UpdateData()
+ {
+ if (!VerifyData()) return;
+ if (double.TryParse(_textBox.Text, out var value))
+ {
+ Value = value;
+ }
+ }
+
+ private void PreviewTextInputHandler(object sender, TextCompositionEventArgs e) => UpdateData();
+
private void TextBox_LostFocus(object sender, RoutedEventArgs e)
{
if (IsError) return;
@@ -103,15 +119,6 @@ namespace HandyControl.Controls
}
}
- private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
- {
- if (!VerifyData()) return;
- if (double.TryParse(_textBox.Text, out var value))
- {
- Value = value;
- }
- }
-
protected override void OnMouseWheel(MouseWheelEventArgs e)
{
base.OnMouseWheel(e);
From 9856ff1225aa1ca4d6fec86ab338e52c85642b93 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 7 Aug 2019 23:06:33 +0800
Subject: [PATCH 06/11] add IgnoreAltF4 Attached Property
---
.../HandyControlDemo_Shared/MainWindow.xaml | 3 +-
.../Controls/Attach/WindowAttach.cs | 32 +++++++++++++++++++
.../Controls/Input/NumericUpDown.cs | 1 -
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
index e82bc22b..9ff31060 100644
--- a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
@@ -12,9 +12,10 @@
ShowTitle="False"
ResizeMode="CanResizeWithGrip"
WindowStartupLocation="CenterScreen"
- hc:GlobalShortcut.Host="True"
DataContext="{Binding Main,Source={StaticResource Locator}}"
+ hc:GlobalShortcut.Host="True"
hc:Dialog.Token="{x:Static data:MessageToken.MainWindow}"
+ hc:WindowAttach.IgnoreAltF4="True"
d:DesignHeight="800"
d:DesignWidth="1400"
Icon="/HandyControlDemo;component/Resources/Img/icon.ico">
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs
index 99909ec9..fb600659 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs
@@ -37,5 +37,37 @@ namespace HandyControl.Controls
System.Windows.Window.GetWindow(obj)?.DragMove();
}
}
+
+ public static readonly DependencyProperty IgnoreAltF4Property = DependencyProperty.RegisterAttached(
+ "IgnoreAltF4", typeof(bool), typeof(WindowAttach), new PropertyMetadata(ValueBoxes.FalseBox, OnIgnoreAltF4Changed));
+
+ private static void OnIgnoreAltF4Changed(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ {
+ if (d is System.Windows.Window window)
+ {
+ if ((bool)e.NewValue)
+ {
+ window.PreviewKeyDown += Window_PreviewKeyDown;
+ }
+ else
+ {
+ window.PreviewKeyDown -= Window_PreviewKeyDown;
+ }
+ }
+ }
+
+ private static void Window_PreviewKeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.Key == Key.System && e.SystemKey == Key.F4)
+ {
+ e.Handled = true;
+ }
+ }
+
+ public static void SetIgnoreAltF4(DependencyObject element, bool value)
+ => element.SetValue(IgnoreAltF4Property, value);
+
+ public static bool GetIgnoreAltF4(DependencyObject element)
+ => (bool) element.GetValue(IgnoreAltF4Property);
}
}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
index f4b8aa78..761fa2d9 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
@@ -1,7 +1,6 @@
using System;
using System.Windows;
using System.Windows.Controls;
-using System.Windows.Documents;
using System.Windows.Input;
using HandyControl.Data;
using HandyControl.Interactivity;
From 9c4fb33c557a38ceb6830b3c9fde2a248bfc0135 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 10 Aug 2019 21:24:37 +0800
Subject: [PATCH 07/11] add HoneycombPanel
---
README.md | 8 +-
Resources/HoneycombPanel.png | Bin 0 -> 187085 bytes
.../HandyControlDemo_Core30.csproj | 3 +
.../HandyControlDemo_Net_40.csproj | 3 +
.../HandyControlDemo_Net_GE45.csproj | 3 +
.../HandyControlDemo_Shared/App.xaml.cs | 3 -
.../Data/MessageToken.cs | 2 +
.../Data/MessageToken.tt | 3 +-
.../HandyControlDemo_Shared.projitems | 7 +
.../Properties/Langs/Lang.Designer.cs | 27 +++
.../Properties/Langs/Lang.en.resx | 9 +
.../Properties/Langs/Lang.resx | 9 +
.../LeftMainContent/PolygonHexagon_16x.png | Bin 0 -> 338 bytes
.../Service/Data/DataService.cs | 12 +-
.../UserControl/Controls/GrowlDemoCtl.xaml.cs | 3 -
.../Controls/HoneycombPanelDemoCtl.xaml | 34 ++++
.../Controls/HoneycombPanelDemoCtl.xaml.cs | 10 ++
.../Controls/ImageBrowserDemoCtl.xaml.cs | 3 -
.../Controls/StepBarDemoCtl.xaml.cs | 3 -
.../UserControl/Main/LeftMainContent.xaml | 7 +-
.../Styles/ExpanderDemoCtl.xaml.cs | 3 -
.../Styles/TextBlockDemoCtl.xaml.cs | 3 -
.../Styles/ToggleButtonDemoCtl.xaml.cs | 3 -
.../ViewModel/Controls/CardDemoViewModel.cs | 23 ++-
.../ViewModel/Main/MainViewModel.cs | 8 +-
.../ViewModel/ViewModelLocator.cs | 2 +-
.../Controls/Panel/HoneycombPanel.cs | 166 ++++++++++++++++++
.../HandyControl_Shared.projitems | 1 +
.../Themes/Styles/Border.xaml | 2 +
29 files changed, 327 insertions(+), 33 deletions(-)
create mode 100644 Resources/HoneycombPanel.png
create mode 100644 src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/PolygonHexagon_16x.png
create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Controls/HoneycombPanelDemoCtl.xaml
create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Controls/HoneycombPanelDemoCtl.xaml.cs
create mode 100644 src/Shared/HandyControl_Shared/Controls/Panel/HoneycombPanel.cs
diff --git a/README.md b/README.md
index aeeee73f..54ad73f9 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,10 @@ Step 4：enjoy coding
## Latest examples
+### HoneycombPanel
+
+
+
### RunningBlock
@@ -81,12 +85,12 @@ Step 4：enjoy coding
+## History publication
+
### ButtonGroup
-## History publication
-
### Grid
diff --git a/Resources/HoneycombPanel.png b/Resources/HoneycombPanel.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1fb329ae76293a8ed42ba00d58e23c24027a736
GIT binary patch
literal 187085
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