GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codestyle fix #1262

Browse Source
This commit is contained in:
Wojtek Figat
2023-09-12 14:21:27 +02:00
parent 6ece66b018
commit 097d26f8cb
2 changed files with 26 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
Source/Editor/CustomEditors/Editors/InputEditor.cs
View File

@@ -1,5 +1,5 @@
 // Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using FlaxEngine; using FlaxEngine;
using FlaxEngine.GUI; using FlaxEngine.GUI;
@@ -22,22 +22,15 @@ namespace FlaxEditor.CustomEditors.Editors
{ {
var dropdownElement = layout.Custom<Dropdown>(); var dropdownElement = layout.Custom<Dropdown>();
_dropdown = dropdownElement.CustomControl; _dropdown = dropdownElement.CustomControl;
var eventNames = new List<LocalizedString>(); var names = new List<LocalizedString>();
foreach (var mapping in Input.ActionMappings) foreach (var mapping in Input.ActionMappings)
{ {
if (eventNames.Contains(mapping.Name)) if (!names.Contains(mapping.Name))
continue; names.Add(mapping.Name);
eventNames.Add(mapping.Name);
} }
_dropdown.Items = eventNames; _dropdown.Items = names;
if (Values[0] is InputEvent value) if (Values[0] is InputEvent inputEvent && names.Contains(inputEvent.Name))
{ _dropdown.SelectedItem = inputEvent.Name;
if (eventNames.Contains(value.Name))
{
_dropdown.SelectedItem = value.Name;
}
}
_dropdown.SelectedIndexChanged += OnSelectedIndexChanged; _dropdown.SelectedIndexChanged += OnSelectedIndexChanged;
} }
@@ -53,17 +46,11 @@ namespace FlaxEditor.CustomEditors.Editors
if (HasDifferentValues) if (HasDifferentValues)
{ {
} }
else else
{ {
if (Values[0] is InputEvent eventValue) if (Values[0] is InputEvent inputEvent && _dropdown.Items.Contains(inputEvent.Name))
{ _dropdown.SelectedItem = inputEvent.Name;
if (_dropdown.Items.Contains(eventValue.Name) && string.Equals(_dropdown.SelectedItem, eventValue.Name, StringComparison.Ordinal))
{
_dropdown.SelectedItem = eventValue.Name;
}
}
} }
} }
@@ -73,7 +60,6 @@ namespace FlaxEditor.CustomEditors.Editors
if (_dropdown != null) if (_dropdown != null)
_dropdown.SelectedIndexChanged -= OnSelectedIndexChanged; _dropdown.SelectedIndexChanged -= OnSelectedIndexChanged;
_dropdown = null; _dropdown = null;
base.Deinitialize();
} }
} }
@@ -93,21 +79,15 @@ namespace FlaxEditor.CustomEditors.Editors
{ {
var dropdownElement = layout.Custom<Dropdown>(); var dropdownElement = layout.Custom<Dropdown>();
_dropdown = dropdownElement.CustomControl; _dropdown = dropdownElement.CustomControl;
var axisNames = new List<LocalizedString>(); var names = new List<LocalizedString>();
foreach (var mapping in Input.AxisMappings) foreach (var mapping in Input.AxisMappings)
{ {
if (axisNames.Contains(mapping.Name)) if (!names.Contains(mapping.Name))
continue; names.Add(mapping.Name);
axisNames.Add(mapping.Name);
}
_dropdown.Items = axisNames;
if (Values[0] is InputAxis value)
{
if (axisNames.Contains(value.Name))
{
_dropdown.SelectedItem = value.Name;
}
} }
_dropdown.Items = names;
if (Values[0] is InputAxis inputAxis && names.Contains(inputAxis.Name))
_dropdown.SelectedItem = inputAxis.Name;
_dropdown.SelectedIndexChanged += OnSelectedIndexChanged; _dropdown.SelectedIndexChanged += OnSelectedIndexChanged;
} }
@@ -123,17 +103,11 @@ namespace FlaxEditor.CustomEditors.Editors
if (HasDifferentValues) if (HasDifferentValues)
{ {
} }
else else
{ {
if (Values[0] is InputAxis axisValue) if (Values[0] is InputAxis inputAxis && _dropdown.Items.Contains(inputAxis.Name))
{ _dropdown.SelectedItem = inputAxis.Name;
if (_dropdown.Items.Contains(axisValue.Name) && string.Equals(_dropdown.SelectedItem, axisValue.Name, StringComparison.Ordinal))
{
_dropdown.SelectedItem = axisValue.Name;
}
}
} }
} }
@@ -143,7 +117,6 @@ namespace FlaxEditor.CustomEditors.Editors
if (_dropdown != null) if (_dropdown != null)
_dropdown.SelectedIndexChanged -= OnSelectedIndexChanged; _dropdown.SelectedIndexChanged -= OnSelectedIndexChanged;
_dropdown = null; _dropdown = null;
base.Deinitialize();
} }
} }
} }