Merge pull request #7701 from AvaloniaUI/fixes/7573-remove-validating…

…-layer Removed TopLevelImpl validating layer.
AvaloniaUI · Feb 25, 2022 · cf40772 · cf40772
2 parents 237a9a4 + bdd576b
commit cf40772
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 361 deletions.
diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs
@@ -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;
         }

diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
@@ -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;            

diff --git a/src/Avalonia.Controls/ValidatingToplevel.cs b/src/Avalonia.Controls/ValidatingToplevel.cs
diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
@@ -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);