Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-11-22 20:58:34 +01:00
Code Issues Projects Releases Wiki Activity

propagate mouse events to children by default, except for panels that handle overflow

Browse source
This commit is contained in:
Ellpeck 2019-08-20 21:41:22 +02:00
parent 72b473dc1d
commit fac7f2beb0
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
MLEM.Ui/Elements/Element.cs
View file

@ -402,17 +402,15 @@ namespace MLEM.Ui.Elements {
} }
} }
public Element GetMousedElement() { public virtual Element GetMousedElement() {
if (this.IsHidden || this.IgnoresMouse) if (this.IsHidden || this.IgnoresMouse)
return null; return null;
if (!this.Area.Contains(this.MousePos))
return null;
for (var i = this.SortedChildren.Count - 1; i >= 0; i--) { for (var i = this.SortedChildren.Count - 1; i >= 0; i--) {
var element = this.SortedChildren[i].GetMousedElement(); var element = this.SortedChildren[i].GetMousedElement();
if (element != null) if (element != null)
return element; return element;
} }
return this; return this.Area.Contains(this.MousePos) ? this : null;
} }
protected virtual void InitStyle(UiStyle style) { protected virtual void InitStyle(UiStyle style) {

7
MLEM.Ui/Elements/Panel.cs
View file

@ -106,6 +106,13 @@ namespace MLEM.Ui.Elements {
base.DrawEarly(time, batch, alpha, blendState, samplerState); base.DrawEarly(time, batch, alpha, blendState, samplerState);
} }
public override Element GetMousedElement() {
// if overflow is handled, don't propagate mouse checks to hidden children
if (this.scrollOverflow && !this.Area.Contains(this.MousePos))
return null;
return base.GetMousedElement();
}
private Rectangle GetRenderTargetArea() { private Rectangle GetRenderTargetArea() {
var area = this.ChildPaddedArea; var area = this.ChildPaddedArea;
area.X = this.DisplayArea.X; area.X = this.DisplayArea.X;