From 727a88d82af3a290f638f5578b631e551c10ad93 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 15 Aug 2010 00:42:39 +1200 Subject: [PATCH] Listbox content shouldn't steal clicks if they're clipped --- OpenRA.Game/Widgets/ListBoxWidget.cs | 7 ++++++- OpenRA.Game/Widgets/Widget.cs | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/OpenRA.Game/Widgets/ListBoxWidget.cs b/OpenRA.Game/Widgets/ListBoxWidget.cs index c21c1b801a..f74eba8e31 100644 --- a/OpenRA.Game/Widgets/ListBoxWidget.cs +++ b/OpenRA.Game/Widgets/ListBoxWidget.cs @@ -83,7 +83,12 @@ namespace OpenRA.Widgets } public override int2 ChildOrigin { get { return RenderOrigin + new int2(0, (int)ListOffset); } } - + + public override Rectangle GetEventBounds() + { + return EventBounds; + } + public override void Tick (World world) { if (UpPressed && ListOffset <= 0) ListOffset += ScrollVelocity; diff --git a/OpenRA.Game/Widgets/Widget.cs b/OpenRA.Game/Widgets/Widget.cs index 722729a0d2..907dfec966 100644 --- a/OpenRA.Game/Widgets/Widget.cs +++ b/OpenRA.Game/Widgets/Widget.cs @@ -149,7 +149,7 @@ namespace OpenRA.Widgets } public virtual Rectangle EventBounds { get { return RenderBounds; } } - public Rectangle GetEventBounds() + public virtual Rectangle GetEventBounds() { return Children .Where(c => c.IsVisible())