Merge pull request #379 from dtrmp/develop

enisn · web-flow · commit c4b16b37a209 · 2025-05-21T10:40:30.000+03:00
Fixed "PlatformView cannot be null here" crash on WinUI
diff --git a/src/InputKit.Maui/Platforms/Windows/Handlers/StatefulGridHandler.Windows.cs b/src/InputKit.Maui/Platforms/Windows/Handlers/StatefulGridHandler.Windows.cs
@@ -12,20 +12,20 @@ public partial class StatefulGridHandler
     {
         protected override void ConnectHandler(LayoutPanel platformView)
         {
-            PlatformView.PointerPressed += NativeView_PointerPressed;
-            PlatformView.PointerReleased += NativeView_PointerReleased;
-            PlatformView.PointerEntered += NativeView_PointerEntered;
-            PlatformView.PointerExited += NativeView_PointerExited;
+            platformView.PointerPressed += NativeView_PointerPressed;
+            platformView.PointerReleased += NativeView_PointerReleased;
+            platformView.PointerEntered += NativeView_PointerEntered;
+            platformView.PointerExited += NativeView_PointerExited;
         }
 
         protected override void DisconnectHandler(LayoutPanel platformView)
         {
-            PlatformView.PointerPressed -= NativeView_PointerPressed;
-            PlatformView.PointerReleased -= NativeView_PointerReleased;
-            PlatformView.PointerEntered -= NativeView_PointerEntered;
-            PlatformView.PointerExited -= NativeView_PointerExited;
+            platformView.PointerPressed -= NativeView_PointerPressed;
+            platformView.PointerReleased -= NativeView_PointerReleased;
+            platformView.PointerEntered -= NativeView_PointerEntered;
+            platformView.PointerExited -= NativeView_PointerExited;
         }
-
+            
         private void NativeView_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
         {
             if (VirtualView is StatefulGrid stateful)
diff --git a/src/InputKit.Maui/Platforms/Windows/Handlers/StatefulStackLayoutHandler.Windows.cs b/src/InputKit.Maui/Platforms/Windows/Handlers/StatefulStackLayoutHandler.Windows.cs
@@ -9,18 +9,18 @@ public partial class StatefulStackLayoutHandler
     {
         protected override void ConnectHandler(LayoutPanel platformView)
         {
-            PlatformView.PointerPressed += NativeView_PointerPressed;
-            PlatformView.PointerReleased += NativeView_PointerReleased;
-            PlatformView.PointerEntered += NativeView_PointerEntered;
-            PlatformView.PointerExited += NativeView_PointerExited;
+            platformView.PointerPressed += NativeView_PointerPressed;
+            platformView.PointerReleased += NativeView_PointerReleased;
+            platformView.PointerEntered += NativeView_PointerEntered;
+            platformView.PointerExited += NativeView_PointerExited;
         }
 
         protected override void DisconnectHandler(LayoutPanel platformView)
         {
-            PlatformView.PointerPressed -= NativeView_PointerPressed;
-            PlatformView.PointerReleased -= NativeView_PointerReleased;
-            PlatformView.PointerEntered -= NativeView_PointerEntered;
-            PlatformView.PointerExited -= NativeView_PointerExited;
+            platformView.PointerPressed -= NativeView_PointerPressed;
+            platformView.PointerReleased -= NativeView_PointerReleased;
+            platformView.PointerEntered -= NativeView_PointerEntered;
+            platformView.PointerExited -= NativeView_PointerExited;
         }
 
         private void NativeView_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)

Original file line number	Diff line number	Diff line change
`@@ -12,20 +12,20 @@ public partial class StatefulGridHandler`
`12`	`12`	`{`
`13`	`13`	`protected override void ConnectHandler(LayoutPanel platformView)`
`14`	`14`	`{`
`15`		`- PlatformView.PointerPressed += NativeView_PointerPressed;`
`16`		`- PlatformView.PointerReleased += NativeView_PointerReleased;`
`17`		`- PlatformView.PointerEntered += NativeView_PointerEntered;`
`18`		`- PlatformView.PointerExited += NativeView_PointerExited;`
	`15`	`+ platformView.PointerPressed += NativeView_PointerPressed;`
	`16`	`+ platformView.PointerReleased += NativeView_PointerReleased;`
	`17`	`+ platformView.PointerEntered += NativeView_PointerEntered;`
	`18`	`+ platformView.PointerExited += NativeView_PointerExited;`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`protected override void DisconnectHandler(LayoutPanel platformView)`
`22`	`22`	`{`
`23`		`- PlatformView.PointerPressed -= NativeView_PointerPressed;`
`24`		`- PlatformView.PointerReleased -= NativeView_PointerReleased;`
`25`		`- PlatformView.PointerEntered -= NativeView_PointerEntered;`
`26`		`- PlatformView.PointerExited -= NativeView_PointerExited;`
	`23`	`+ platformView.PointerPressed -= NativeView_PointerPressed;`
	`24`	`+ platformView.PointerReleased -= NativeView_PointerReleased;`
	`25`	`+ platformView.PointerEntered -= NativeView_PointerEntered;`
	`26`	`+ platformView.PointerExited -= NativeView_PointerExited;`
`27`	`27`	`}`
`28`		`-`
	`28`	`+`
`29`	`29`	`private void NativeView_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)`
`30`	`30`	`{`
`31`	`31`	`if (VirtualView is StatefulGrid stateful)`
Original file line number	Diff line number	Diff line change
`@@ -9,18 +9,18 @@ public partial class StatefulStackLayoutHandler`
`9`	`9`	`{`
`10`	`10`	`protected override void ConnectHandler(LayoutPanel platformView)`
`11`	`11`	`{`
`12`		`- PlatformView.PointerPressed += NativeView_PointerPressed;`
`13`		`- PlatformView.PointerReleased += NativeView_PointerReleased;`
`14`		`- PlatformView.PointerEntered += NativeView_PointerEntered;`
`15`		`- PlatformView.PointerExited += NativeView_PointerExited;`
	`12`	`+ platformView.PointerPressed += NativeView_PointerPressed;`
	`13`	`+ platformView.PointerReleased += NativeView_PointerReleased;`
	`14`	`+ platformView.PointerEntered += NativeView_PointerEntered;`
	`15`	`+ platformView.PointerExited += NativeView_PointerExited;`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`protected override void DisconnectHandler(LayoutPanel platformView)`
`19`	`19`	`{`
`20`		`- PlatformView.PointerPressed -= NativeView_PointerPressed;`
`21`		`- PlatformView.PointerReleased -= NativeView_PointerReleased;`
`22`		`- PlatformView.PointerEntered -= NativeView_PointerEntered;`
`23`		`- PlatformView.PointerExited -= NativeView_PointerExited;`
	`20`	`+ platformView.PointerPressed -= NativeView_PointerPressed;`
	`21`	`+ platformView.PointerReleased -= NativeView_PointerReleased;`
	`22`	`+ platformView.PointerEntered -= NativeView_PointerEntered;`
	`23`	`+ platformView.PointerExited -= NativeView_PointerExited;`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`private void NativeView_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)`