mirror of
https://github.com/Ellpeck/MLEM.git
synced 2024-11-25 14:08:34 +01:00
Compare commits
2 commits
9f60a59706
...
02cf01fcb7
Author | SHA1 | Date | |
---|---|---|---|
02cf01fcb7 | |||
fe89b28031 |
6 changed files with 42 additions and 8 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -4,4 +4,4 @@ obj
|
|||
packages
|
||||
*.user
|
||||
tools
|
||||
TestResults
|
||||
TestResults*
|
||||
|
|
|
@ -9,6 +9,10 @@ using MLEM.Misc;
|
|||
using MLEM.Ui.Elements;
|
||||
using MLEM.Ui.Style;
|
||||
|
||||
#if NET452
|
||||
using MLEM.Extensions;
|
||||
#endif
|
||||
|
||||
namespace MLEM.Ui {
|
||||
/// <summary>
|
||||
/// UiControls holds and manages all of the controls for a <see cref="UiSystem"/>.
|
||||
|
@ -367,7 +371,7 @@ namespace MLEM.Ui {
|
|||
protected virtual Element GetTabNextElement(bool backward) {
|
||||
if (this.ActiveRoot == null)
|
||||
return null;
|
||||
var children = this.ActiveRoot.Element.GetChildren(c => !c.IsHidden, true, true).Concat(Enumerable.Repeat(this.ActiveRoot.Element, 1))
|
||||
var children = this.ActiveRoot.Element.GetChildren(c => !c.IsHidden, true, true).Append(this.ActiveRoot.Element)
|
||||
// we can't add these checks to GetChildren because it ignores false grandchildren
|
||||
.Where(c => c.CanBeSelected && c.AutoNavGroup == this.SelectedElement?.AutoNavGroup);
|
||||
if (this.SelectedElement?.Root != this.ActiveRoot) {
|
||||
|
@ -402,7 +406,7 @@ namespace MLEM.Ui {
|
|||
protected virtual Element GetGamepadNextElement(Direction2 direction) {
|
||||
if (this.ActiveRoot == null)
|
||||
return null;
|
||||
var children = this.ActiveRoot.Element.GetChildren(c => !c.IsHidden, true, true).Concat(Enumerable.Repeat(this.ActiveRoot.Element, 1))
|
||||
var children = this.ActiveRoot.Element.GetChildren(c => !c.IsHidden, true, true).Append(this.ActiveRoot.Element)
|
||||
// we can't add these checks to GetChildren because it ignores false grandchildren
|
||||
.Where(c => c.CanBeSelected && c.AutoNavGroup == this.SelectedElement?.AutoNavGroup);
|
||||
if (this.SelectedElement?.Root != this.ActiveRoot) {
|
||||
|
|
|
@ -25,7 +25,7 @@ namespace MLEM.Extensions {
|
|||
public static IEnumerable<IEnumerable<T>> Combinations<T>(this IEnumerable<IEnumerable<T>> things) {
|
||||
var combos = Enumerable.Repeat(Enumerable.Empty<T>(), 1);
|
||||
foreach (var t in things)
|
||||
combos = combos.SelectMany(c => t.Select(o => c.Concat(Enumerable.Repeat(o, 1))));
|
||||
combos = combos.SelectMany(c => t.Select(c.Append));
|
||||
return combos;
|
||||
}
|
||||
|
||||
|
@ -47,9 +47,33 @@ namespace MLEM.Extensions {
|
|||
public static IEnumerable<IEnumerable<int>> IndexCombinations<T>(this IEnumerable<IEnumerable<T>> things) {
|
||||
var combos = Enumerable.Repeat(Enumerable.Empty<int>(), 1);
|
||||
foreach (var t in things)
|
||||
combos = combos.SelectMany(c => t.Select((o, i) => c.Concat(Enumerable.Repeat(i, 1))));
|
||||
combos = combos.SelectMany(c => t.Select((o, i) => c.Append(i)));
|
||||
return combos;
|
||||
}
|
||||
|
||||
#if NET452
|
||||
/// <summary>Appends a value to the end of the sequence.</summary>
|
||||
/// <param name="source">A sequence of values.</param>
|
||||
/// <param name="element">The value to append to <paramref name="source"/>.</param>
|
||||
/// <typeparam name="T">The type of the elements of <paramref name="source"/>.</typeparam>
|
||||
/// <returns>A new sequence that ends with <paramref name="element"/>.</returns>
|
||||
public static IEnumerable<T> Append<T>(this IEnumerable<T> source, T element) {
|
||||
foreach (var src in source)
|
||||
yield return src;
|
||||
yield return element;
|
||||
}
|
||||
|
||||
/// <summary>Prepends a value to the beginning of the sequence.</summary>
|
||||
/// <param name="source">A sequence of values.</param>
|
||||
/// <param name="element">The value to prepend to <paramref name="source"/>.</param>
|
||||
/// <typeparam name="T">The type of the elements of <paramref name="source"/>.</typeparam>
|
||||
/// <returns>A new sequence that begins with <paramref name="element"/>.</returns>
|
||||
public static IEnumerable<T> Prepend<T>(this IEnumerable<T> source, T element) {
|
||||
yield return element;
|
||||
foreach (var src in source)
|
||||
yield return src;
|
||||
}
|
||||
#endif
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,6 +3,10 @@ using System.Collections.Generic;
|
|||
using System.Linq;
|
||||
using System.Runtime.Serialization;
|
||||
|
||||
#if NET452
|
||||
using MLEM.Extensions;
|
||||
#endif
|
||||
|
||||
namespace MLEM.Input {
|
||||
/// <summary>
|
||||
/// A keybind represents a generic way to trigger input.
|
||||
|
@ -44,7 +48,7 @@ namespace MLEM.Input {
|
|||
/// <param name="modifiers">The modifier keys that have to be held down.</param>
|
||||
/// <returns>This keybind, for chaining</returns>
|
||||
public Keybind Add(GenericInput key, params GenericInput[] modifiers) {
|
||||
this.combinations = this.combinations.Concat(Enumerable.Repeat(new Combination(key, modifiers), 1)).ToArray();
|
||||
this.combinations = this.combinations.Append(new Combination(key, modifiers)).ToArray();
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -63,7 +67,7 @@ namespace MLEM.Input {
|
|||
/// <param name="modifiers">The modifier keys that have to be held down.</param>
|
||||
/// <returns>This keybind, for chaining.</returns>
|
||||
public Keybind Insert(int index, GenericInput key, params GenericInput[] modifiers) {
|
||||
this.combinations = this.combinations.Take(index).Concat(Enumerable.Repeat(new Combination(key, modifiers), 1)).Concat(this.combinations.Skip(index)).ToArray();
|
||||
this.combinations = this.combinations.Take(index).Append(new Combination(key, modifiers)).Concat(this.combinations.Skip(index)).ToArray();
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -351,7 +355,7 @@ namespace MLEM.Input {
|
|||
/// <param name="inputName">The function to use for determining the display name of a <see cref="GenericInput"/>. If this is null, the generic input's default <see cref="GenericInput.ToString"/> method is used.</param>
|
||||
/// <returns>A human-readable string representing this combination</returns>
|
||||
public string ToString(string joiner, Func<GenericInput, string> inputName = null) {
|
||||
return string.Join(joiner, this.Modifiers.Concat(Enumerable.Repeat(this.Key, 1)).Select(i => inputName?.Invoke(i) ?? i.ToString()));
|
||||
return string.Join(joiner, this.Modifiers.Append(this.Key).Select(i => inputName?.Invoke(i) ?? i.ToString()));
|
||||
}
|
||||
|
||||
/// <summary>Compares the current instance with another object of the same type and returns an integer that indicates whether the current instance precedes, follows, or occurs in the same position in the sort order as the other object.</summary>
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
<PropertyGroup>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<VSTestLogger>nunit</VSTestLogger>
|
||||
<VSTestResultsDirectory>TestResults.FNA</VSTestResultsDirectory>
|
||||
<RootNamespace>Tests</RootNamespace>
|
||||
<DefineConstants>$(DefineConstants);FNA</DefineConstants>
|
||||
<IsPackable>false</IsPackable>
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
<PropertyGroup>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<VSTestLogger>nunit</VSTestLogger>
|
||||
<VSTestResultsDirectory>TestResults</VSTestResultsDirectory>
|
||||
<IsPackable>false</IsPackable>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
Loading…
Reference in a new issue