diff --git a/MLEM.Ui/Elements/Element.cs b/MLEM.Ui/Elements/Element.cs index 5445b95..6da76a7 100644 --- a/MLEM.Ui/Elements/Element.cs +++ b/MLEM.Ui/Elements/Element.cs @@ -259,7 +259,7 @@ namespace MLEM.Ui.Elements { public float DrawAlpha = 1; /// - /// Stores whether this element is currently being moused over or touched. + /// Stores whether this element is currently being moused over. /// public bool IsMouseOver { get; protected set; } /// @@ -300,14 +300,6 @@ namespace MLEM.Ui.Elements { /// public GenericCallback OnMouseExit; /// - /// Event that is called when this element starts being touched - /// - public GenericCallback OnTouchEnter; - /// - /// Event that is called when this element stops being touched - /// - public GenericCallback OnTouchExit; - /// /// Event that is called when text input is made. /// Note that this event is called for every element, even if it is not selected. /// Also note that if is true, this event is never called. @@ -323,11 +315,6 @@ namespace MLEM.Ui.Elements { /// public OtherElementCallback OnMousedElementChanged; /// - /// Event that is called when the element that is currently being touched changes within the ui system. - /// Note that the event fired doesn't necessarily correlate to this specific element. - /// - public OtherElementCallback OnTouchedElementChanged; - /// /// Event that is called when the element that is currently selected changes within the ui system. /// Note that the event fired doesn't necessarily correlate to this specific element. /// @@ -375,8 +362,6 @@ namespace MLEM.Ui.Elements { this.OnMouseEnter += element => this.IsMouseOver = true; this.OnMouseExit += element => this.IsMouseOver = false; - this.OnTouchEnter += element => this.IsMouseOver = true; - this.OnTouchExit += element => this.IsMouseOver = false; this.OnSelected += element => this.IsSelected = true; this.OnDeselected += element => this.IsSelected = false; this.GetTabNextElement += (backward, next) => next; diff --git a/MLEM.Ui/UiControls.cs b/MLEM.Ui/UiControls.cs index 3de8385..7fe791f 100644 --- a/MLEM.Ui/UiControls.cs +++ b/MLEM.Ui/UiControls.cs @@ -40,10 +40,6 @@ namespace MLEM.Ui { /// The that the mouse is currently over. /// public Element MousedElement { get; private set; } - /// - /// The that is currently touched. - /// - public Element TouchedElement { get; private set; } private readonly Dictionary selectedElements = new Dictionary(); /// /// The element that is currently selected. @@ -204,16 +200,6 @@ namespace MLEM.Ui { this.SelectElement(this.ActiveRoot, held); if (held != null && held.CanBePressed) this.System.OnElementSecondaryPressed?.Invoke(held); - } else { - var held = this.Input.TouchState.Select(l => this.GetElementUnderPos(l.Position)).FirstOrDefault(); - if (held != this.TouchedElement) { - if (this.TouchedElement != null) - this.System.OnElementTouchExit?.Invoke(this.TouchedElement); - if (held != null) - this.System.OnElementTouchEnter?.Invoke(held); - this.TouchedElement = held; - this.System.OnTouchedElementChanged?.Invoke(held); - } } } diff --git a/MLEM.Ui/UiSystem.cs b/MLEM.Ui/UiSystem.cs index 2a398b6..0a4bbc7 100644 --- a/MLEM.Ui/UiSystem.cs +++ b/MLEM.Ui/UiSystem.cs @@ -141,14 +141,6 @@ namespace MLEM.Ui { /// public Element.GenericCallback OnElementMouseExit = e => e.OnMouseExit?.Invoke(e); /// - /// Event that is invoked when an starts being touched - /// - public Element.GenericCallback OnElementTouchEnter = e => e.OnTouchEnter?.Invoke(e); - /// - /// Event that is invoked when an stops being touched - /// - public Element.GenericCallback OnElementTouchExit = e => e.OnTouchExit?.Invoke(e); - /// /// Event that is invoked when an 's display area changes /// public Element.GenericCallback OnElementAreaUpdated = e => e.OnAreaUpdated?.Invoke(e); @@ -157,10 +149,6 @@ namespace MLEM.Ui { /// public Element.GenericCallback OnMousedElementChanged; /// - /// Event that is invoked when the that is being touched changes - /// - public Element.GenericCallback OnTouchedElementChanged; - /// /// Event that is invoked when the selected changes, either through automatic navigation, or by pressing on an element with the mouse /// public Element.GenericCallback OnSelectedElementChanged; @@ -196,7 +184,6 @@ namespace MLEM.Ui { TextInputWrapper.Current.AddListener(window, (sender, key, character) => this.ApplyToAll(e => e.OnTextInput?.Invoke(e, key, character))); this.OnMousedElementChanged = e => this.ApplyToAll(t => t.OnMousedElementChanged?.Invoke(t, e)); - this.OnTouchedElementChanged = e => this.ApplyToAll(t => t.OnTouchedElementChanged?.Invoke(t, e)); this.OnSelectedElementChanged = e => this.ApplyToAll(t => t.OnSelectedElementChanged?.Invoke(t, e)); this.OnSelectedElementDrawn = (element, time, batch, alpha) => { if (this.Controls.IsAutoNavMode && element.SelectionIndicator.HasValue()) {