Browse Source
Merge branch 'spline-easing' of github.com:AvaloniaUI/Avalonia into spline-easing
pull/4180/head
Jumar Macato
6 years ago
No known key found for this signature in database
GPG Key ID: B19884DAC3A5BF3F
2 changed files with
4 additions and
4 deletions
-
src/Avalonia.Controls/SelectionModel.cs
-
src/Avalonia.Controls/TopLevel.cs
|
|
|
@ -189,8 +189,6 @@ namespace Avalonia.Controls |
|
|
|
} |
|
|
|
set |
|
|
|
{ |
|
|
|
var isSelected = IsSelectedWithPartialAt(value); |
|
|
|
|
|
|
|
if (!IsSelectedAt(value) || SelectedItems.Count > 1) |
|
|
|
{ |
|
|
|
using var operation = new Operation(this); |
|
|
|
|
|
|
|
@ -340,6 +340,9 @@ namespace Avalonia.Controls |
|
|
|
_globalStyles.GlobalStylesRemoved -= ((IStyleHost)this).StylesRemoved; |
|
|
|
} |
|
|
|
|
|
|
|
Renderer?.Dispose(); |
|
|
|
Renderer = null; |
|
|
|
|
|
|
|
var logicalArgs = new LogicalTreeAttachmentEventArgs(this, this, null); |
|
|
|
((ILogical)this).NotifyDetachedFromLogicalTree(logicalArgs); |
|
|
|
|
|
|
|
@ -349,8 +352,7 @@ namespace Avalonia.Controls |
|
|
|
(this as IInputRoot).MouseDevice?.TopLevelClosed(this); |
|
|
|
PlatformImpl = null; |
|
|
|
OnClosed(EventArgs.Empty); |
|
|
|
Renderer?.Dispose(); |
|
|
|
Renderer = null; |
|
|
|
|
|
|
|
LayoutManager?.Dispose(); |
|
|
|
} |
|
|
|
|
|
|
|
|