Browse Source

Merge branch 'master' of https://github.com/AvaloniaUI/Avalonia

pull/7394/head
Dave Higgins 5 years ago
parent
commit
1b7e588a06
  1. 15
      src/Avalonia.Controls/ValidatingToplevel.cs

15
src/Avalonia.Controls/ValidatingToplevel.cs

@ -236,7 +236,18 @@ internal class ValidatingWindowImpl : ValidatingWindowBaseImpl, IWindowImpl
public void SetTitle(string title) => Inner.SetTitle(title); 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); public void SetEnabled(bool enable) => Inner.SetEnabled(enable);
@ -323,4 +334,4 @@ internal class ValidatingPopupImpl : ValidatingWindowBaseImpl, IPopupImpl
public IPopupPositioner PopupPositioner => Inner.PopupPositioner; public IPopupPositioner PopupPositioner => Inner.PopupPositioner;
public void SetWindowManagerAddShadowHint(bool enabled) => Inner.SetWindowManagerAddShadowHint(enabled); public void SetWindowManagerAddShadowHint(bool enabled) => Inner.SetWindowManagerAddShadowHint(enabled);
} }

Loading…
Cancel
Save