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

made controls independent of ui systems to allow for multiple controls for one ui

Browse source
This commit is contained in:
Ellpeck 2020-03-17 15:04:36 +01:00
parent ba973c1b72
commit 5e3fdbb8ef
2 changed files with 37 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
MLEM.Ui/UiControls.cs
View file

@ -1,4 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Input; using Microsoft.Xna.Framework.Input;
@ -17,7 +18,8 @@ namespace MLEM.Ui {
public RootElement ActiveRoot { get; private set; } public RootElement ActiveRoot { get; private set; }
public Element MousedElement { get; private set; } public Element MousedElement { get; private set; }
public Element SelectedElement => this.ActiveRoot?.SelectedElement; private readonly Dictionary<string, Element> selectedElements = new Dictionary<string, Element>();
public Element SelectedElement => this.GetSelectedElement(this.ActiveRoot);
public Buttons[] GamepadButtons = {Buttons.A}; public Buttons[] GamepadButtons = {Buttons.A};
public Buttons[] SecondaryGamepadButtons = {Buttons.X}; public Buttons[] SecondaryGamepadButtons = {Buttons.X};
@ -62,7 +64,7 @@ namespace MLEM.Ui {
if (this.Input.IsMouseButtonPressed(MouseButton.Left)) { if (this.Input.IsMouseButtonPressed(MouseButton.Left)) {
this.IsAutoNavMode = false; this.IsAutoNavMode = false;
var selectedNow = mousedNow != null && mousedNow.CanBeSelected ? mousedNow : null; var selectedNow = mousedNow != null && mousedNow.CanBeSelected ? mousedNow : null;
this.ActiveRoot?.SelectElement(selectedNow); this.SelectElement(this.ActiveRoot, selectedNow);
if (mousedNow != null && mousedNow.CanBePressed) if (mousedNow != null && mousedNow.CanBePressed)
this.System.OnElementPressed?.Invoke(mousedNow); this.System.OnElementPressed?.Invoke(mousedNow);
} else if (this.Input.IsMouseButtonPressed(MouseButton.Right)) { } else if (this.Input.IsMouseButtonPressed(MouseButton.Right)) {
@ -91,7 +93,7 @@ namespace MLEM.Ui {
var next = this.GetTabNextElement(backward); var next = this.GetTabNextElement(backward);
if (this.SelectedElement?.Root != null) if (this.SelectedElement?.Root != null)
next = this.SelectedElement.GetTabNextElement(backward, next); next = this.SelectedElement.GetTabNextElement(backward, next);
this.ActiveRoot?.SelectElement(next); this.SelectElement(this.ActiveRoot, next);
} }
} }
@ -100,13 +102,13 @@ namespace MLEM.Ui {
if (this.Input.GetGesture(GestureType.Tap, out var tap)) { if (this.Input.GetGesture(GestureType.Tap, out var tap)) {
this.IsAutoNavMode = false; this.IsAutoNavMode = false;
var tapped = this.GetElementUnderPos(tap.Position); var tapped = this.GetElementUnderPos(tap.Position);
this.ActiveRoot?.SelectElement(tapped); this.SelectElement(this.ActiveRoot, tapped);
if (tapped != null && tapped.CanBePressed) if (tapped != null && tapped.CanBePressed)
this.System.OnElementPressed?.Invoke(tapped); this.System.OnElementPressed?.Invoke(tapped);
} else if (this.Input.GetGesture(GestureType.Hold, out var hold)) { } else if (this.Input.GetGesture(GestureType.Hold, out var hold)) {
this.IsAutoNavMode = false; this.IsAutoNavMode = false;
var held = this.GetElementUnderPos(hold.Position); var held = this.GetElementUnderPos(hold.Position);
this.ActiveRoot?.SelectElement(held); this.SelectElement(this.ActiveRoot, held);
if (held != null && held.CanBePressed) if (held != null && held.CanBePressed)
this.System.OnElementSecondaryPressed?.Invoke(held); this.System.OnElementSecondaryPressed?.Invoke(held);
} }
@ -142,6 +144,32 @@ namespace MLEM.Ui {
return null; return null;
} }
public void SelectElement(RootElement root, Element element, bool? autoNav = null) {
if (root == null)
return;
var selected = this.GetSelectedElement(root);
if (selected == element)
return;
if (selected != null)
this.System.OnElementDeselected?.Invoke(selected);
if (element != null) {
this.System.OnElementSelected?.Invoke(element);
this.selectedElements[root.Name] = element;
} else {
this.selectedElements.Remove(root.Name);
}
this.System.OnSelectedElementChanged?.Invoke(element);
if (autoNav != null)
this.IsAutoNavMode = autoNav.Value;
}
public Element GetSelectedElement(RootElement root) {
this.selectedElements.TryGetValue(root.Name, out var element);
return element;
}
protected virtual Element GetTabNextElement(bool backward) { protected virtual Element GetTabNextElement(bool backward) {
if (this.ActiveRoot == null) if (this.ActiveRoot == null)
return null; return null;
@ -223,7 +251,7 @@ namespace MLEM.Ui {
if (this.SelectedElement != null) if (this.SelectedElement != null)
next = this.SelectedElement.GetGamepadNextElement(dir, next); next = this.SelectedElement.GetGamepadNextElement(dir, next);
if (next != null) if (next != null)
this.ActiveRoot.SelectElement(next); this.SelectElement(this.ActiveRoot, next);
} }
} }

17
MLEM.Ui/UiSystem.cs
View file

@ -146,7 +146,7 @@ namespace MLEM.Ui {
if (root == null) if (root == null)
return; return;
this.rootElements.Remove(root); this.rootElements.Remove(root);
root.SelectElement(null); this.Controls.SelectElement(root, null);
root.Element.AndChildren(e => { root.Element.AndChildren(e => {
e.Root = null; e.Root = null;
e.System = null; e.System = null;
@ -214,7 +214,7 @@ namespace MLEM.Ui {
public Matrix Transform = Matrix.Identity; public Matrix Transform = Matrix.Identity;
public Matrix InvTransform => Matrix.Invert(this.Transform); public Matrix InvTransform => Matrix.Invert(this.Transform);
public Element SelectedElement { get; private set; } public Element SelectedElement => this.System.Controls.GetSelectedElement(this);
public bool CanSelectContent { get; private set; } public bool CanSelectContent { get; private set; }
public Element.GenericCallback OnElementAdded; public Element.GenericCallback OnElementAdded;
@ -236,18 +236,7 @@ namespace MLEM.Ui {
} }
public void SelectElement(Element element, bool? autoNav = null) { public void SelectElement(Element element, bool? autoNav = null) {
if (this.SelectedElement == element) this.System.Controls.SelectElement(this, element, autoNav);
return;
if (this.SelectedElement != null)
this.System.OnElementDeselected?.Invoke(this.SelectedElement);
if (element != null)
this.System.OnElementSelected?.Invoke(element);
this.SelectedElement = element;
this.System.OnSelectedElementChanged?.Invoke(element);
if (autoNav != null)
this.System.Controls.IsAutoNavMode = autoNav.Value;
} }
} }