From a54fc6986922c0bc03b4bfff2c0450724a5029e0 Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Tue, 3 Sep 2019 23:27:19 +0800 Subject: [PATCH 1/4] init branch --- .../HandyControlDemo_Core30.csproj | 3 ++ .../HandyControlDemo_Net_40.csproj | 3 ++ .../HandyControlDemo_Net_GE45.csproj | 3 ++ .../Data/MessageToken.cs | 2 + .../Data/MessageToken.tt | 3 +- .../HandyControlDemo_Shared.projitems | 7 +++ .../Properties/Langs/Lang.Designer.cs | 9 ++++ .../Properties/Langs/Lang.en.resx | 3 ++ .../Properties/Langs/Lang.fa.resx | 3 ++ .../Properties/Langs/Lang.fr.resx | 3 ++ .../Properties/Langs/Lang.resx | 3 ++ .../Img/LeftMainContent/SplitButton_16x.png | Bin 0 -> 311 bytes .../Controls/SplitButtonDemoCtl.xaml | 6 +++ .../Controls/SplitButtonDemoCtl.xaml.cs | 10 ++++ .../UserControl/Main/LeftMainContent.xaml | 7 ++- .../Controls/Button/SplitButton.cs | 18 +++++++ .../Other/TransitioningContentControl.cs | 29 +++++++++-- .../Data/Enum/MouseHitMode.cs | 8 +++ .../HandyControl_Shared.projitems | 10 ++++ .../Styles/Base/SplitButtonBaseStyle.xaml | 14 ++++++ .../Themes/Styles/SplitButton.xaml | 10 ++++ .../Themes/Styles/Style.xaml | 1 + .../Styles/TransitioningContentControl.xaml | 46 +++++++++--------- 23 files changed, 170 insertions(+), 31 deletions(-) create mode 100644 src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/SplitButton_16x.png create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Controls/SplitButtonDemoCtl.xaml create mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Controls/SplitButtonDemoCtl.xaml.cs create mode 100644 src/Shared/HandyControl_Shared/Controls/Button/SplitButton.cs create mode 100644 src/Shared/HandyControl_Shared/Data/Enum/MouseHitMode.cs create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/Base/SplitButtonBaseStyle.xaml create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/SplitButton.xaml diff --git a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj index ad7fbab1..a463f64c 100644 --- a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj +++ b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj @@ -417,6 +417,9 @@ Resources\Img\thumbs_up.png + + Resources\Img\SplitButton_16x.png + diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj index ba107c4e..3c9f4539 100644 --- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj +++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj @@ -429,6 +429,9 @@ TextTemplatingFileGenerator MessageToken.cs + + Resources\Img\LeftMainContent\SplitButton_16x.png + Resources\Img\LeftMainContent\thumbs_up.png diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj index 2287cbee..dfa44c93 100644 --- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj +++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj @@ -492,6 +492,9 @@ TextTemplatingFileGenerator MessageToken.cs + + Resources\Img\LeftMainContent\SplitButton_16x.png + Resources\Img\LeftMainContent\thumbs_up.png diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs index 3ffee119..7f8f0df7 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs +++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs @@ -116,6 +116,8 @@ public static readonly string FloatingBlockDemoCtl = nameof(FloatingBlockDemoCtl); + public static readonly string SplitButtonDemoCtl = nameof(SplitButtonDemoCtl); + public static readonly string ButtonDemoCtl = nameof(ButtonDemoCtl); public static readonly string RepeatButtonDemoCtl = nameof(RepeatButtonDemoCtl); diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt index 2978eea6..b2e1f283 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt +++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.tt @@ -60,7 +60,8 @@ var controlList = new List "HoneycombPanelDemoCtl", "SpriteDemoCtl", "NotificationDemoCtl", - "FloatingBlockDemoCtl" + "FloatingBlockDemoCtl", + "SplitButtonDemoCtl" }; var styleList = new List { diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems index cddc13cc..a1c92435 100644 --- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems +++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems @@ -183,6 +183,9 @@ SideMenuDemoCtl.xaml + + SplitButtonDemoCtl.xaml + SpriteDemoCtl.xaml @@ -621,6 +624,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs index 71c11a57..a5c6c81e 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs @@ -1401,6 +1401,15 @@ namespace HandyControlDemo.Properties.Langs { } } + /// + /// 查找类似 分割按钮 的本地化字符串。 + /// + public static string SplitButton { + get { + return ResourceManager.GetString("SplitButton", resourceCulture); + } + } + /// /// 查找类似 精灵 的本地化字符串。 /// diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx index 5114bdd6..3159b7da 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx @@ -663,4 +663,7 @@ FloatingBlock + + SplitButton + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx index 07d9c0ff..5c85daba 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx @@ -663,4 +663,7 @@ FloatingBlock + + SplitButton + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx index ff7f70f8..6963d7af 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx @@ -663,4 +663,7 @@ FloatingBlock + + SplitButton + \ 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 c3c1bec7..4da16852 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx @@ -663,4 +663,7 @@ 漂浮块 + + 分割按钮 + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/SplitButton_16x.png b/src/Shared/HandyControlDemo_Shared/Resources/Img/LeftMainContent/SplitButton_16x.png new file mode 100644 index 0000000000000000000000000000000000000000..80e46664e51a8b957212d2c7646c593584db771c GIT binary patch literal 311 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5M?jcysy3fAQ1GRv zi(^Pd+|kK~ea!|UF8g(*uFEvqa*9ql8P}lnL~LP#ch!;!A~FpsxtG+p8@MlE@tU?V z<)lz+uZGd2rRs+7l{cJSmbpmx;TFSrZG|#Vc^VgA=TfW_c_`eLI3YFCFHyoux8&i0 zuOFW6TGxF3xAXK@Ui;opKKHNO{rm0aGbOR^k!4J5o|8QIGG?`X`s06c+k$32nH_g( z63%aWy^|xfblLOQD=oT|y!eloGG8hYo8hEteC!%;14H0u$-FAFDsdIq`SsD;HOwrx`q5{an^L HB{Ts5%%p#Q literal 0 HcmV?d00001 diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SplitButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SplitButtonDemoCtl.xaml new file mode 100644 index 00000000..944a9d6a --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SplitButtonDemoCtl.xaml @@ -0,0 +1,6 @@ + + + diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SplitButtonDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SplitButtonDemoCtl.xaml.cs new file mode 100644 index 00000000..45ead592 --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SplitButtonDemoCtl.xaml.cs @@ -0,0 +1,10 @@ +namespace HandyControlDemo.UserControl +{ + public partial class SplitButtonDemoCtl + { + public SplitButtonDemoCtl() + { + InitializeComponent(); + } + } +} diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml index e5d1313c..4f903dd1 100644 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml @@ -225,6 +225,11 @@ + + + + + @@ -330,7 +335,7 @@ - + diff --git a/src/Shared/HandyControl_Shared/Controls/Button/SplitButton.cs b/src/Shared/HandyControl_Shared/Controls/Button/SplitButton.cs new file mode 100644 index 00000000..e3ad2892 --- /dev/null +++ b/src/Shared/HandyControl_Shared/Controls/Button/SplitButton.cs @@ -0,0 +1,18 @@ +using System.Windows; +using System.Windows.Controls.Primitives; +using HandyControl.Data.Enum; + +namespace HandyControl.Controls +{ + public class SplitButton : ButtonBase + { + public static readonly DependencyProperty HitModeProperty = DependencyProperty.Register( + "HitMode", typeof(MouseHitMode), typeof(SplitButton), new PropertyMetadata(default(MouseHitMode))); + + public MouseHitMode HitMode + { + get => (MouseHitMode) GetValue(HitModeProperty); + set => SetValue(HitModeProperty, value); + } + } +} diff --git a/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs b/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs index 64c0cf75..fe84b94a 100644 --- a/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs +++ b/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs @@ -4,6 +4,7 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Windows; using System.Windows.Controls; +using System.Windows.Markup; using System.Windows.Media.Animation; using HandyControl.Data; using HandyControl.Tools; @@ -14,7 +15,8 @@ namespace HandyControl.Controls [TemplateVisualState(GroupName = PresentationGroup, Name = DefaultTransitionState)] [TemplatePart(Name = PreviousContentPresentationSitePartName, Type = typeof(ContentControl))] [TemplatePart(Name = CurrentContentPresentationSitePartName, Type = typeof(ContentControl))] - public class TransitioningContentControl : ContentControl + [ContentProperty("Content")] + public class TransitioningContentControl : Control { private Storyboard _currentTransition; @@ -76,11 +78,28 @@ namespace HandyControl.Controls VisualStateManager.GoToState(this, Transition, true); } - protected override void OnContentChanged(object oldContent, object newContent) - { - base.OnContentChanged(oldContent, newContent); + public static readonly DependencyProperty ContentProperty = DependencyProperty.Register( + "Content", typeof(object), typeof(TransitioningContentControl), new PropertyMetadata(default(object), OnContentChanged)); - StartTransition(oldContent, newContent); + private static void OnContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + var ctl = (TransitioningContentControl) d; + ctl.StartTransition(e.OldValue, e.NewValue); + } + + public static readonly DependencyProperty ContentTemplateProperty = DependencyProperty.Register( + "ContentTemplate", typeof(DataTemplate), typeof(TransitioningContentControl), new PropertyMetadata(default(DataTemplate))); + + public DataTemplate ContentTemplate + { + get => (DataTemplate) GetValue(ContentTemplateProperty); + set => SetValue(ContentTemplateProperty, value); + } + + public object Content + { + get => GetValue(ContentProperty); + set => SetValue(ContentProperty, value); } [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "newContent", Justification = "Should be used in the future.")] diff --git a/src/Shared/HandyControl_Shared/Data/Enum/MouseHitMode.cs b/src/Shared/HandyControl_Shared/Data/Enum/MouseHitMode.cs new file mode 100644 index 00000000..6232328a --- /dev/null +++ b/src/Shared/HandyControl_Shared/Data/Enum/MouseHitMode.cs @@ -0,0 +1,8 @@ +namespace HandyControl.Data.Enum +{ + public enum MouseHitMode + { + Click, + Hover + } +} diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems index 6aa8a170..898fddd7 100644 --- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems +++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems @@ -21,6 +21,7 @@ + @@ -34,6 +35,7 @@ + @@ -390,6 +392,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -778,6 +784,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + MSBuild:Compile Designer diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/SplitButtonBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SplitButtonBaseStyle.xaml new file mode 100644 index 00000000..273e9fe9 --- /dev/null +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SplitButtonBaseStyle.xaml @@ -0,0 +1,14 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/SplitButton.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/SplitButton.xaml new file mode 100644 index 00000000..f72a35d0 --- /dev/null +++ b/src/Shared/HandyControl_Shared/Themes/Styles/SplitButton.xaml @@ -0,0 +1,10 @@ + + + + + + + + @@ -351,7 +350,7 @@ - + diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/DateTimePickerBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/DateTimePickerBaseStyle.xaml index 2eb9d802..e9ad4187 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/DateTimePickerBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/DateTimePickerBaseStyle.xaml @@ -1,7 +1,6 @@  @@ -162,13 +161,13 @@ @@ -330,7 +329,7 @@ - + diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/NumericUpDownBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/NumericUpDownBaseStyle.xaml index b01ad9fd..ff1162ae 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/NumericUpDownBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/NumericUpDownBaseStyle.xaml @@ -1,8 +1,7 @@  + xmlns:interactivity="clr-namespace:HandyControl.Interactivity"> @@ -131,12 +130,12 @@ @@ -270,7 +269,7 @@ - + diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/PasswordBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/PasswordBoxBaseStyle.xaml index 6028041e..e06d7e23 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/PasswordBoxBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/PasswordBoxBaseStyle.xaml @@ -1,7 +1,6 @@  @@ -115,7 +114,7 @@ @@ -291,7 +290,7 @@ - + @@ -301,7 +300,7 @@ - + diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressButtonBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressButtonBaseStyle.xaml index 5f1b92ff..c5606579 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressButtonBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressButtonBaseStyle.xaml @@ -1,7 +1,6 @@  + xmlns:controls="clr-namespace:HandyControl.Controls"> @@ -32,7 +31,7 @@ - + diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/SearchBarBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SearchBarBaseStyle.xaml index f79bfddd..5f40254b 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/SearchBarBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SearchBarBaseStyle.xaml @@ -1,7 +1,6 @@  @@ -109,13 +108,13 @@ @@ -249,7 +248,7 @@ - + diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/SplitButtonBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SplitButtonBaseStyle.xaml index 273e9fe9..9da8e511 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/SplitButtonBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SplitButtonBaseStyle.xaml @@ -3,12 +3,92 @@ xmlns:controls="clr-namespace:HandyControl.Controls"> - + + - \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml index f91ce695..a4a2fa47 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml @@ -1,7 +1,6 @@  @@ -130,12 +129,12 @@ @@ -265,7 +264,7 @@ - + diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TimePickerBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TimePickerBaseStyle.xaml index aebdd389..ae115ada 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TimePickerBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TimePickerBaseStyle.xaml @@ -1,7 +1,6 @@  @@ -162,13 +161,13 @@ @@ -330,7 +329,7 @@ - + diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/SplitButton.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/SplitButton.xaml index f72a35d0..3e3ba2dc 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/SplitButton.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/SplitButton.xaml @@ -1,10 +1,42 @@  - + + + + + + + + + + \ No newline at end of file From e5029aa5dd7b3167d974479d3ac05bf6d267b4af Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Tue, 17 Sep 2019 00:49:35 +0800 Subject: [PATCH 4/4] add SplitButton --- README.md | 4 +++ .../HandyControlDemo_Shared.projitems | 1 - .../Resources/Themes/Styles/Style.xaml | 5 +-- .../Basic/CustomSplitButtonItem.cs | 10 ------ .../Controls/SplitButtonDemoCtl.xaml | 33 +++++++------------ .../Controls/Block/FloatingBlock.cs | 8 ++--- .../Button/{SplitButton => }/SplitButton.cs | 27 ++++++--------- .../Button/SplitButton/ISplitButtonItem.cs | 6 ---- .../Button/SplitButton/SplitButtonItem.cs | 9 ----- .../Controls/Input/DateTimePicker.cs | 1 - .../HandyControl_Shared.projitems | 4 +-- .../Styles/Base/SplitButtonBaseStyle.xaml | 13 ++------ 12 files changed, 34 insertions(+), 87 deletions(-) delete mode 100644 src/Shared/HandyControlDemo_Shared/UserControl/Basic/CustomSplitButtonItem.cs rename src/Shared/HandyControl_Shared/Controls/Button/{SplitButton => }/SplitButton.cs (79%) delete mode 100644 src/Shared/HandyControl_Shared/Controls/Button/SplitButton/ISplitButtonItem.cs delete mode 100644 src/Shared/HandyControl_Shared/Controls/Button/SplitButton/SplitButtonItem.cs diff --git a/README.md b/README.md index f6426bca..c6676eac 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,10 @@ Step 4：enjoy coding ## Latest examples +### SplitButton + +![SplitButton](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/SplitButton.png) + ### FloatingBlock ![FloatingBlock](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/FloatingBlock.gif) diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems index 347a43c1..38e214fb 100644 --- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems +++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems @@ -38,7 +38,6 @@ ChatBox.xaml - InteractiveDialog.xaml diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml index 9167c105..49a0d290 100644 --- a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml +++ b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml @@ -1,7 +1,6 @@  + xmlns:hc="https://handyorg.github.io/handycontrol"> @@ -99,6 +98,4 @@ -