diff --git a/README.md b/README.md index 402c5f19..7c5f1c52 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,12 @@ Step 2:Add code in App.xaml as follows: ``` Step 3:enjoy coding +## Overview + +![Overview](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Overview.png) + +![Overview-dark](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Overview-dark.png) + ## Latest examples ### SideMenu diff --git a/Resources/Overview-dark.png b/Resources/Overview-dark.png new file mode 100644 index 00000000..ded33060 Binary files /dev/null and b/Resources/Overview-dark.png differ diff --git a/Resources/Overview.png b/Resources/Overview.png new file mode 100644 index 00000000..d0211362 Binary files /dev/null and b/Resources/Overview.png differ diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/OverView.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/OverView.xaml index 3b78e1af..71f041e5 100644 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/OverView.xaml +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/OverView.xaml @@ -361,7 +361,7 @@ - + diff --git a/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs b/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs index 8de601af..64c0cf75 100644 --- a/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs +++ b/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs @@ -48,10 +48,10 @@ namespace HandyControl.Controls public override void OnApplyTemplate() { - //if (DesignerProperties.GetIsInDesignMode(this)) return; + if (DesignerProperties.GetIsInDesignMode(this)) return; - //if (IsTransitioning) - // AbortTransition(); + if (IsTransitioning) + AbortTransition(); base.OnApplyTemplate(); @@ -63,17 +63,17 @@ namespace HandyControl.Controls if (CurrentContentPresentationSite != null) CurrentContentPresentationSite.Content = Content; - //var transition = GetStoryboard(Transition); - //CurrentTransition = transition; - //if (transition == null) - //{ - // Transition = DefaultTransitionState; + var transition = GetStoryboard(Transition); + CurrentTransition = transition; + if (transition == null) + { + Transition = DefaultTransitionState; - // throw new ArgumentException("TransitioningContentControl_TransitionNotFound"); - //} + throw new ArgumentException("TransitioningContentControl_TransitionNotFound"); + } - //VisualStateManager.GoToState(this, NormalState, false); - //VisualStateManager.GoToState(this, Transition, true); + VisualStateManager.GoToState(this, NormalState, false); + VisualStateManager.GoToState(this, Transition, true); } protected override void OnContentChanged(object oldContent, object newContent)