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

Remove dedicated title edit row, merge with Editor SectionWidget

Browse source
This commit is contained in:
John Lewin 2018-05-22 13:28:42 -07:00
parent 2e1ac70f68
commit 7c29214d20
1 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
PartPreviewWindow/SelectedObjectPanel.cs
View file

@ -68,19 +68,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.scene = scene;
this.printer = printer;
this.AddChild(inlineTitleEdit = new InlineTitleEdit("", theme, "Object Name")
{
Border = new BorderDouble(bottom: 1),
BorderColor = theme.GetBorderColor(50)
});
inlineTitleEdit.TitleChanged += (s, e) =>
{
if (item != null)
{
item.Name = inlineTitleEdit.Text;
}
};
this.ContentPanel = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
HAnchor = HAnchor.Stretch,
@ -197,7 +184,23 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
Padding = new BorderDouble(top: 10)
});
inlineTitleEdit = new InlineTitleEdit("", theme, "Object Name");
inlineTitleEdit.TitleChanged += (s, e) =>
{
if (item != null)
{
item.Name = inlineTitleEdit.Text;
}
};
editorSection = new SectionWidget("Editor", editorColumn, theme, serializationKey: UserSettingsKey.EditorPanelExpanded, defaultExpansion: true);
// TODO: Replace hackery with practical solution
if (editorSection.Children.FirstOrDefault() is ExpandCheckboxButton checkbox)
{
checkbox.ReplaceChild(checkbox.Children[1], inlineTitleEdit);
}
this.ContentPanel.AddChild(editorSection);
var colorSection = new SectionWidget(