nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Lower precedence of List<string> editor

Browse source 
- MatterHackers/MCCentral#3949
SurfacedEditors field appears instead of subtract
This commit is contained in:
John Lewin 2018-08-03 18:29:25 -07:00
parent aac3a0f238
commit 58c97ab6e9
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

36
DesignTools/PublicPropertyEditor.cs
View file

@ -313,24 +313,6 @@ namespace MatterHackers.MatterControl.DesignTools
rowContainer = CreateSettingsColumn(property, field);
}
#if !__ANDROID__
else if (propertyValue is List<string> stringList)
{
var selectedItem = ApplicationController.Instance.DragDropData.SceneContext.Scene.SelectedItem;
var field = new SurfacedEditorsField(theme, selectedItem);
field.Initialize(0);
field.ListValue = stringList;
field.ValueChanged += (s, e) =>
{
property.SetValue(field.ListValue);
};
rowContainer = CreateSettingsColumn(property, field);
rowContainer.Descendants<HorizontalSpacer>().FirstOrDefault()?.Close();
}
#endif
else if (propertyValue is Vector3 vector3)
{
var field = new Vector3Field();
@ -427,6 +409,24 @@ namespace MatterHackers.MatterControl.DesignTools
rowContainer = CreateSettingsColumn(property);
rowContainer.AddChild(CreateImageDisplay(imageBuffer, property.Item, theme));
}
#if !__ANDROID__
else if (propertyValue is List<string> stringList)
{
var selectedItem = ApplicationController.Instance.DragDropData.SceneContext.Scene.SelectedItem;
var field = new SurfacedEditorsField(theme, selectedItem);
field.Initialize(0);
field.ListValue = stringList;
field.ValueChanged += (s, e) =>
{
property.SetValue(field.ListValue);
};
rowContainer = CreateSettingsColumn(property, field);
rowContainer.Descendants<HorizontalSpacer>().FirstOrDefault()?.Close();
}
#endif
// create a int editor
else if (propertyValue is int intValue)
{