Browse Source

Merge branch 'master' into feature/handleTabstopps

pull/7044/head
Benedikt Stebner 5 years ago
committed by GitHub
parent
commit
4aa742a0e2
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/Avalonia.Controls/Flyouts/FlyoutBase.cs
  2. 1
      src/Avalonia.Controls/Window.cs

2
src/Avalonia.Controls/Flyouts/FlyoutBase.cs

@ -22,7 +22,7 @@ namespace Avalonia.Controls.Primitives
/// <summary>
/// Defines the <see cref="IsOpen"/> property
/// </summary>
private static readonly DirectProperty<FlyoutBase, bool> IsOpenProperty =
public static readonly DirectProperty<FlyoutBase, bool> IsOpenProperty =
AvaloniaProperty.RegisterDirect<FlyoutBase, bool>(nameof(IsOpen),
x => x.IsOpen);

1
src/Avalonia.Controls/Window.cs

@ -994,6 +994,7 @@ namespace Avalonia.Controls
protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
{
base.OnPropertyChanged(change);
if (change.Property == SystemDecorationsProperty)
{
var typedNewValue = change.NewValue.GetValueOrDefault<SystemDecorations>();

Loading…
Cancel
Save