Browse Source
Merge branch 'master' into compiledbindings-themes
pull/7388/head
Tako
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
13 additions and
2 deletions
src/Avalonia.Controls/ValidatingToplevel.cs
@ -236,7 +236,18 @@ internal class ValidatingWindowImpl : ValidatingWindowBaseImpl, IWindowImpl
public void SetTitle ( string title ) = > Inner . SetTitle ( title ) ;
public void SetParent ( IWindowImpl parent ) = > Inner . SetParent ( parent ) ;
public void SetParent ( IWindowImpl parent )
{
//Workaround. SetParent will cast IWindowImpl to WindowImpl but ValidatingWindowImpl isn't actual WindowImpl so it will fail with InvalidCastException.
if ( parent is ValidatingWindowImpl validatingToplevelImpl )
{
Inner . SetParent ( validatingToplevelImpl . Inner ) ;
}
else
{
Inner . SetParent ( parent ) ;
}
}
public void SetEnabled ( bool enable ) = > Inner . SetEnabled ( enable ) ;
@ -323,4 +334,4 @@ internal class ValidatingPopupImpl : ValidatingWindowBaseImpl, IPopupImpl
public IPopupPositioner PopupPositioner = > Inner . PopupPositioner ;
public void SetWindowManagerAddShadowHint ( bool enabled ) = > Inner . SetWindowManagerAddShadowHint ( enabled ) ;
}
}