chfei/HandyControl
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add screenshot

Browse Source
This commit is contained in:
NaBian committed 2019-05-06 00:47:36 +08:00
1 parent e558669183
commit d7d30fdbc7
5 files changed
+19 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Shared/HandyControlDemo_Shared/UserControl/Main/OverView.xaml
+1 -1
View File
@@ -361,7 +361,7 @@
<controls:Tag ShowCloseButton="False" Content="TextText"/>
</controls:TagPanel>
</Border>
<Border Visibility="Collapsed" Width="14" Height="14" Background="Black" Canvas.Left="290" Canvas.Top="1040"/>
<!--<Border Visibility="Collapsed" Width="14" Height="14" Background="Black" Canvas.Left="290" Canvas.Top="1040"/>-->
</Canvas>
</ScrollViewer>
</UserControl>
src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs
+12 -12
View File
@@ -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)