Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed TopLevelImpl validating layer. #7701

Merged
merged 1 commit into from
Feb 25, 2022
Merged

Removed TopLevelImpl validating layer. #7701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Avalonia.Controls/Primitives/PopupRoot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public PopupRoot(TopLevel parent, IPopupImpl impl)
/// The dependency resolver to use. If null the default dependency resolver will be used.
/// </param>
public PopupRoot(TopLevel parent, IPopupImpl impl, IAvaloniaDependencyResolver? dependencyResolver)
: base(ValidatingPopupImpl.Wrap(impl), dependencyResolver)
: base(impl, dependencyResolver)
{
_parent = parent;
}
Expand Down
2 changes: 0 additions & 2 deletions src/Avalonia.Controls/TopLevel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,6 @@ public TopLevel(ITopLevelImpl impl, IAvaloniaDependencyResolver? dependencyResol
"Could not create window implementation: maybe no windowing subsystem was initialized?");
}

impl = ValidatingToplevelImpl.Wrap(impl);

PlatformImpl = impl;

_actualTransparencyLevel = PlatformImpl.TransparencyLevel;
Expand Down
344 changes: 0 additions & 344 deletions src/Avalonia.Controls/ValidatingToplevel.cs
View file
Open in desktop

This file was deleted.

11 changes: 5 additions & 6 deletions src/Avalonia.Controls/Window.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,14 +237,13 @@ public Window()
/// </summary>
/// <param name="impl">The window implementation.</param>
public Window(IWindowImpl impl)
: base(ValidatingWindowImpl.Wrap(impl))
: base(impl)
{
var wrapped = (IWindowImpl)base.PlatformImpl!;
wrapped.Closing = HandleClosing;
wrapped.GotInputWhenDisabled = OnGotInputWhenDisabled;
wrapped.WindowStateChanged = HandleWindowStateChanged;
impl.Closing = HandleClosing;
impl.GotInputWhenDisabled = OnGotInputWhenDisabled;
impl.WindowStateChanged = HandleWindowStateChanged;
_maxPlatformClientSize = PlatformImpl?.MaxAutoSizeHint ?? default(Size);
wrapped.ExtendClientAreaToDecorationsChanged = ExtendClientAreaToDecorationsChanged;
impl.ExtendClientAreaToDecorationsChanged = ExtendClientAreaToDecorationsChanged;
this.GetObservable(ClientSizeProperty).Skip(1).Subscribe(x => PlatformImpl?.Resize(x, PlatformResizeReason.Application));

PlatformImpl?.ShowTaskbarIcon(ShowInTaskbar);
Expand Down
Loading