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

Changes to add child

Browse source
This commit is contained in:
Lars Brubaker 2020-06-05 12:16:37 -07:00
parent c31b6e0114
commit f2e2d54628
9 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
MatterControlLib/PartPreviewWindow/Tabs.cs
View file

@ -198,15 +198,15 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
}
public override void AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
public override GuiWidget AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
{
if (this.TabContainer == this)
{
base.AddChild(childToAdd, indexInChildrenList);
return base.AddChild(childToAdd, indexInChildrenList);
}
else
{
this.TabContainer.AddChild(childToAdd, indexInChildrenList);
return this.TabContainer.AddChild(childToAdd, indexInChildrenList);
}
}

4
MatterControlLib/PartPreviewWindow/Toolbar.cs
View file

@ -66,9 +66,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.RightAnchorItem = rightAnchorItem;
}
public override void AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
public override GuiWidget AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
{
ActionArea.AddChild(childToAdd, indexInChildrenList);
return ActionArea.AddChild(childToAdd, indexInChildrenList);
}
public void AddChildDirect(GuiWidget guiWidget)

4
MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs
View file

@ -265,10 +265,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
buttonIsBeingClicked = false;
}
public override void AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
public override GuiWidget AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
{
childToAdd.VAnchor = VAnchor.Center;
base.AddChild(childToAdd, indexInChildrenList);
return base.AddChild(childToAdd, indexInChildrenList);
}
public override void OnClosed(EventArgs e)

4
MatterControlLib/SlicerConfiguration/SettingsRow.cs
View file

@ -153,11 +153,11 @@ namespace MatterHackers.MatterControl.CustomWidgets
public ArrowDirection ArrowDirection { get; set; } = ArrowDirection.Right;
public override void AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
public override GuiWidget AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
{
childToAdd.Selectable = this.FullRowSelect == false;
base.AddChild(childToAdd, indexInChildrenList);
return base.AddChild(childToAdd, indexInChildrenList);
}
protected override void OnClick(MouseEventArgs mouseEvent)

8
MatterControlLib/Utilities/MarkdigAgg/AggListRenderer.cs
View file

@ -19,7 +19,7 @@ namespace Markdig.Renderers.Agg
this.HAnchor = HAnchor.Stretch;
}
public override void AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
public override GuiWidget AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
{
if (childToAdd is TextWidget textWidget)
{
@ -27,7 +27,7 @@ namespace Markdig.Renderers.Agg
textWidget.PointSize = 11;
}
base.AddChild(childToAdd, indexInChildrenList);
return base.AddChild(childToAdd, indexInChildrenList);
}
}
@ -51,10 +51,10 @@ namespace Markdig.Renderers.Agg
});
}
public override void AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
public override GuiWidget AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
{
// TODOD: Anything else required for list children?
content.AddChild(childToAdd, indexInChildrenList);
return content.AddChild(childToAdd, indexInChildrenList);
}
}

4
MatterControlLib/Utilities/MarkdigAgg/HeadingRowX.cs
View file

@ -19,7 +19,7 @@ namespace Markdig.Renderers.Agg
this.RowPadding = new BorderDouble(0, 3);
}
public override void AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
public override GuiWidget AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
{
if (childToAdd is TextWidget textWidget)
{
@ -37,7 +37,7 @@ namespace Markdig.Renderers.Agg
}
}
base.AddChild(childToAdd, indexInChildrenList);
return base.AddChild(childToAdd, indexInChildrenList);
}
}
}

4
MatterControlLib/Utilities/MarkdigAgg/Inlines/AggCodeInlineRenderer.cs
View file

@ -21,9 +21,9 @@ namespace Markdig.Renderers.Agg.Inlines
this.BackgroundColor = theme.MinimalShade;
}
public override void AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
public override GuiWidget AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
{
base.AddChild(childToAdd, indexInChildrenList);
return base.AddChild(childToAdd, indexInChildrenList);
}
}

4
MatterControlLib/Utilities/MarkdigAgg/Inlines/AggEmphasisInlineRenderer.cs
View file

@ -20,7 +20,7 @@ namespace Markdig.Renderers.Agg.Inlines
this.delimiter = delimiter;
}
public override void AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
public override GuiWidget AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
{
if (childToAdd is TextWidget textWidget)
{
@ -42,7 +42,7 @@ namespace Markdig.Renderers.Agg.Inlines
}
}
base.AddChild(childToAdd, indexInChildrenList);
return base.AddChild(childToAdd, indexInChildrenList);
}
}

4
MatterControlLib/Utilities/MarkdigAgg/Inlines/AggLinkInlineRenderer.cs
View file

@ -52,7 +52,7 @@ namespace Markdig.Renderers.Agg.Inlines
base.OnClick(mouseEvent);
}
public override void AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
public override GuiWidget AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
{
if (childToAdd is TextWidget textWidget)
{
@ -63,7 +63,7 @@ namespace Markdig.Renderers.Agg.Inlines
// Allow link parent to own mouse events
childToAdd.Selectable = false;
base.AddChild(childToAdd, indexInChildrenList);
return base.AddChild(childToAdd, indexInChildrenList);
}
}