epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a text field next to the map editor actor initializer sliders.

Browse Source
This commit is contained in:
Niklas Holma
2020-09-27 18:49:17 +01:00
committed by abcdefg30
parent b5613acad8
commit 8596ce00cc
4 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.Common/Widgets/Logic/Editor/ActorEditLogic.cs
View File

@@ -308,6 +308,20 @@ namespace OpenRA.Mods.Common.Widgets.Logic
slider.OnChange += value => so.OnChange(actor, value); slider.OnChange += value => so.OnChange(actor, value);
slider.OnChange += value => editorActionHandle.OnChange(value); slider.OnChange += value => editorActionHandle.OnChange(value);
var valueField = sliderContainer.GetOrNull<TextFieldWidget>("VALUE");
if (valueField != null)
{
Action<float> updateValueField = f => valueField.Text = ((int)f).ToString();
updateValueField(so.GetValue(actor));
slider.OnChange += updateValueField;
valueField.OnTextEdited = () =>
{
if (float.TryParse(valueField.Text, out var result))
slider.UpdateValue(result);
};
}
initContainer.AddChild(sliderContainer); initContainer.AddChild(sliderContainer);
} }
else if (o is EditorActorDropdown) else if (o is EditorActorDropdown)

8
OpenRA.Mods.Common/Widgets/SliderWidget.cs
View File

@@ -48,10 +48,12 @@ namespace OpenRA.Mods.Common.Widgets
GetValue = other.GetValue; GetValue = other.GetValue;
} }
void UpdateValue(float newValue) public void UpdateValue(float newValue)
{ {
var oldValue = Value;
Value = newValue.Clamp(MinimumValue, MaximumValue); Value = newValue.Clamp(MinimumValue, MaximumValue);
OnChange(Value); if (oldValue != Value)
OnChange(Value);
} }
public override bool HandleMouseInput(MouseInput mi) public override bool HandleMouseInput(MouseInput mi)
@@ -114,7 +116,7 @@ namespace OpenRA.Mods.Common.Widgets
if (!IsVisible()) if (!IsVisible())
return; return;
Value = GetValue(); UpdateValue(GetValue());
var tr = ThumbRect; var tr = ThumbRect;
var rb = RenderBounds; var rb = RenderBounds;

8
mods/cnc/chrome/editor.yaml
View File

@@ -277,8 +277,14 @@ Container@EDITOR_WORLD_ROOT:
Slider@OPTION: Slider@OPTION:
X: 58 X: 58
Y: 1 Y: 1
Width: 207 Width: 146
Height: 20 Height: 20
TextField@VALUE:
X: 206
Y: 1
Width: 50
Height: 20
Type: Integer
Container@DROPDOWN_OPTION_TEMPLATE: Container@DROPDOWN_OPTION_TEMPLATE:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 27 Height: 27

8
mods/common/chrome/editor.yaml
View File

@@ -271,8 +271,14 @@ Container@EDITOR_WORLD_ROOT:
Slider@OPTION: Slider@OPTION:
X: 75 X: 75
Y: 1 Y: 1
Width: 210 Width: 149
Height: 20 Height: 20
TextField@VALUE:
X: 226
Y: 1
Width: 50
Height: 20
Type: Integer
Container@DROPDOWN_OPTION_TEMPLATE: Container@DROPDOWN_OPTION_TEMPLATE:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: 27 Height: 27