Input handling fix

rds1983 · Nov 11, 2023 · 9188797 · 9188797
1 parent 6f85a03
commit 9188797
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 33 deletions.
diff --git a/samples/Myra.Samples.AndroidAllWidgets/Myra.Samples.AndroidAllWidgets.csproj b/samples/Myra.Samples.AndroidAllWidgets/Myra.Samples.AndroidAllWidgets.csproj
@@ -15,8 +15,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Android" Version="$(MonoGameVersion)" />
-    <PackageReference Include="MonoGame.Content.Builder.Task" Version="$(MonoGameVersion)" />
+    <PackageReference Include="MonoGame.Framework.Android" Version="$(AppMonoGameVersion)" />
+    <PackageReference Include="MonoGame.Content.Builder.Task" Version="$(AppMonoGameVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Myra/Graphics2D/UI/Container.cs b/src/Myra/Graphics2D/UI/Container.cs
@@ -50,5 +50,7 @@ public void RemoveChild(Widget child)
 		{
 			Widgets.Remove(child);
 		}
+
+		public override bool InputFallsThrough(Point localPos) => Background == null;
 	}
 }
diff --git a/src/Myra/Graphics2D/UI/Containers/ScrollViewer.cs b/src/Myra/Graphics2D/UI/Containers/ScrollViewer.cs
@@ -643,5 +643,21 @@ protected override void InternalSetStyle(Stylesheet stylesheet, string name)
 		{
 			ApplyScrollViewerStyle(stylesheet.ScrollViewerStyles.SafelyGetStyle(name));
 		}
+
+		public override bool InputFallsThrough(Point localPos)
+		{
+			if (Background != null)
+			{
+				return false;
+			}
+
+			if (_horizontalScrollingOn && _horizontalScrollbarFrame.Contains(localPos) ||
+				_verticalScrollingOn && _verticalScrollbarFrame.Contains(localPos))
+			{
+				return false;
+			}
+
+			return true;
+		}
 	}
 }
diff --git a/src/Myra/Graphics2D/UI/Widget.Input.cs b/src/Myra/Graphics2D/UI/Widget.Input.cs
@@ -239,14 +239,14 @@ protected internal virtual void ProcessInput(InputContext inputContext)
 				{
 					if (!Desktop.IsMobile)
 					{
-						if (IsMouseInside)
+						if (IsMouseInside && !InputFallsThrough(LocalMousePosition.Value))
 						{
 							inputContext.MouseOrTouchHandled = true;
 						}
 					}
 					else
 					{
-						if (IsTouchInside)
+						if (IsTouchInside && !InputFallsThrough(LocalTouchPosition.Value))
 						{
 							inputContext.MouseOrTouchHandled = true;
 						}

diff --git a/src/Myra/Graphics2D/UI/Widget.cs b/src/Myra/Graphics2D/UI/Widget.cs
@@ -1410,12 +1410,15 @@ public virtual Widget HitTest(Point p)
 				}
 			}
 
-			if (result == null && !this.FallsThrough(p)) 
+			var localPos = ToLocal(p);
+			if (result == null && !InputFallsThrough(localPos)) 
 			{
 				result = this;
 			}
 
 			return result;
 		}
+
+		public virtual bool InputFallsThrough(Point localPos) => false;
 	}
 }
diff --git a/src/Myra/Utility/UIUtils.cs b/src/Myra/Utility/UIUtils.cs
@@ -64,33 +64,5 @@ public static void SortWidgetsByZIndex(this List<Widget> list)
 				n = newN;
 			} while (n > 1);
 		}
-
-		public static bool FallsThrough(this Widget w, Point p)
-		{
-			// Only containers can fall through
-			if (!(w is Container || w is ScrollViewer))
-			{
-				return false;
-			}
-
-			// Real containers are solid only if backround is set
-			if (w.Background != null)
-			{
-				return false;
-			}
-
-			var asScrollViewer = w as ScrollViewer;
-			if (asScrollViewer != null)
-			{
-				// Special case
-				if (asScrollViewer._horizontalScrollingOn && asScrollViewer._horizontalScrollbarFrame.Contains(p) ||
-					asScrollViewer._verticalScrollingOn && asScrollViewer._verticalScrollbarFrame.Contains(p))
-				{
-					return false;
-				}
-			}
-
-			return true;
-		}
 	}
 }
diff --git a/src/MyraPad/Studio.cs b/src/MyraPad/Studio.cs
@@ -315,6 +315,7 @@ protected override void LoadContent()
 			base.LoadContent();
 
 			MyraEnvironment.Game = this;
+			MyraEnvironment.EnableModalDarkening = true;
 
 			_desktop = new Desktop();