Browse Source
Merge branch 'master' into fixes/TypefaceLeak
pull/4627/head
Benedikt Stebner
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
3 deletions
-
src/Avalonia.Controls/Primitives/ScrollBar.cs
-
src/Avalonia.Visuals/Visual.cs
|
|
|
@ -141,7 +141,7 @@ namespace Avalonia.Controls.Primitives |
|
|
|
_ => throw new InvalidOperationException("Invalid value for ScrollBar.Visibility.") |
|
|
|
}; |
|
|
|
|
|
|
|
SetValue(IsVisibleProperty, isVisible, BindingPriority.Style); |
|
|
|
SetValue(IsVisibleProperty, isVisible); |
|
|
|
} |
|
|
|
|
|
|
|
protected override void OnKeyDown(KeyEventArgs e) |
|
|
|
|
|
|
|
@ -455,7 +455,7 @@ namespace Avalonia |
|
|
|
} |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// Called when the control is added to a visual tree.
|
|
|
|
/// Called when the control is added to a rooted visual tree.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="e">The event args.</param>
|
|
|
|
protected virtual void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e) |
|
|
|
@ -463,7 +463,7 @@ namespace Avalonia |
|
|
|
} |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// Called when the control is removed from a visual tree.
|
|
|
|
/// Called when the control is removed from a rooted visual tree.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="e">The event args.</param>
|
|
|
|
protected virtual void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e) |
|
|
|
|