From d26b4693c25b0dcd3cf965986c887ce577b5c802 Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Fri, 14 Jun 2019 23:07:32 +0800 Subject: [PATCH] add ToggleButtonFlip Style --- .../HandyControl_Net_GE45.csproj | 1 + .../Properties/Langs/Lang.Designer.cs | 18 +++ .../Properties/Langs/Lang.en.resx | 6 + .../Properties/Langs/Lang.resx | 6 + .../Styles/ToggleButtonDemoCtl.xaml | 23 ++++ .../HandyControl_Shared.projitems | 1 + .../Themes/Styles/ToggleButton.xaml | 119 ++++++++++++++++++ .../Extension/FrameworkElementExtension.cs | 58 +++++++++ 8 files changed, 232 insertions(+) create mode 100644 src/Shared/HandyControl_Shared/Tools/Extension/FrameworkElementExtension.cs 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 ee98de46..96b1b1bc 100644 --- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj +++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj @@ -162,6 +162,7 @@ Properties\Langs\Lang.resx PublicResXFileCodeGenerator Lang.Designer.cs + Designer diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs index c7bbd51a..d4b6a070 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs @@ -816,6 +816,15 @@ namespace HandyControlDemo.Properties.Langs { } } + /// + /// 查找类似 关 的本地化字符串。 + /// + public static string Off { + get { + return ResourceManager.GetString("Off", resourceCulture); + } + } + /// /// 查找类似 确定 的本地化字符串。 /// @@ -825,6 +834,15 @@ namespace HandyControlDemo.Properties.Langs { } } + /// + /// 查找类似 开 的本地化字符串。 + /// + public static string On { + get { + return ResourceManager.GetString("On", resourceCulture); + } + } + /// /// 查找类似 点击打开背景模糊窗口 的本地化字符串。 /// diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx index 05550cb0..68dc57fe 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx @@ -612,4 +612,10 @@ RelativePanel + + On + + + Off + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx index 1ee1deb2..84a43c24 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx @@ -612,4 +612,10 @@ 相对布局 + + 开 + + + 关 + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml index aba17c7e..34ec4516 100644 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml @@ -104,6 +104,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems index 32e07fa8..368a727b 100644 --- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems +++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems @@ -23,6 +23,7 @@ + diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml index 97645eed..9204464a 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml @@ -3,6 +3,7 @@ xmlns:controls="clr-namespace:HandyControl.Controls"> + @@ -101,6 +102,124 @@ +