Browse Source

Merge branch 'master' into fix-more-typos

pull/9889/head
Simon Cropp 4 years ago
committed by GitHub
parent
commit
92c8907fef
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      src/Avalonia.Controls/TransitioningContentControl.cs
  2. 2
      src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs

6
src/Avalonia.Controls/TransitioningContentControl.cs

@ -69,6 +69,10 @@ public class TransitioningContentControl : ContentControl
{ {
Dispatcher.UIThread.Post(() => UpdateContentWithTransition(Content)); Dispatcher.UIThread.Post(() => UpdateContentWithTransition(Content));
} }
else if (change.Property == CurrentContentProperty)
{
UpdateLogicalTree(change.OldValue, change.NewValue);
}
} }
protected override void ContentChanged(AvaloniaPropertyChangedEventArgs e) protected override void ContentChanged(AvaloniaPropertyChangedEventArgs e)
@ -94,8 +98,6 @@ public class TransitioningContentControl : ContentControl
if (PageTransition != null) if (PageTransition != null)
await PageTransition.Start(this, null, true, localToken); await PageTransition.Start(this, null, true, localToken);
UpdateLogicalTree(CurrentContent, content);
if (localToken.IsCancellationRequested) if (localToken.IsCancellationRequested)
{ {
return; return;

2
src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaXamlIlRuntimeCompiler.cs

@ -179,7 +179,7 @@ namespace Avalonia.Markup.Xaml.XamlIl
} }
finally finally
{ {
if( _sreCanSave) if(!success && _sreCanSave)
DumpRuntimeCompilationResults(); DumpRuntimeCompilationResults();
} }
} }

Loading…
Cancel
Save