Browse Source
Merge branch 'master' into fixes/hotkey-manager-leak-fix
pull/4823/head
Lighto
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
1 deletions
-
build/SharedVersion.props
-
src/Avalonia.Controls/Primitives/VisualLayerManager.cs
|
|
|
@ -15,7 +15,8 @@ |
|
|
|
<PackageTags>avalonia;avaloniaui;mvvm;rx;reactive extensions;android;ios;mac;forms;wpf;net;netstandard;net461;uwp;xamarin</PackageTags> |
|
|
|
<PackageReleaseNotes>https://github.com/AvaloniaUI/Avalonia/releases</PackageReleaseNotes> |
|
|
|
<RepositoryType>git</RepositoryType> |
|
|
|
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\avalonia.snk</AssemblyOriginatorKeyFile> |
|
|
|
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\avalonia.snk</AssemblyOriginatorKeyFile> |
|
|
|
<SignAssembly>True</SignAssembly> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
<ItemGroup Label="PackageIcon"> |
|
|
|
|
|
|
|
@ -67,6 +67,8 @@ namespace Avalonia.Controls.Primitives |
|
|
|
{ |
|
|
|
get |
|
|
|
{ |
|
|
|
if (IsPopup) |
|
|
|
return null; |
|
|
|
var rv = FindLayer<LightDismissOverlayLayer>(); |
|
|
|
if (rv == null) |
|
|
|
{ |
|
|
|
|
