From f2e2d546287855215c463e9ddf13b67e196bd55d Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 5 Jun 2020 12:16:37 -0700 Subject: [PATCH] Changes to add child --- MatterControlLib/PartPreviewWindow/Tabs.cs | 6 +++--- MatterControlLib/PartPreviewWindow/Toolbar.cs | 4 ++-- .../View3D/PrinterBar/PrinterActionsBar.cs | 4 ++-- MatterControlLib/SlicerConfiguration/SettingsRow.cs | 4 ++-- MatterControlLib/Utilities/MarkdigAgg/AggListRenderer.cs | 8 ++++---- MatterControlLib/Utilities/MarkdigAgg/HeadingRowX.cs | 4 ++-- .../Utilities/MarkdigAgg/Inlines/AggCodeInlineRenderer.cs | 4 ++-- .../MarkdigAgg/Inlines/AggEmphasisInlineRenderer.cs | 4 ++-- .../Utilities/MarkdigAgg/Inlines/AggLinkInlineRenderer.cs | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/MatterControlLib/PartPreviewWindow/Tabs.cs b/MatterControlLib/PartPreviewWindow/Tabs.cs index 75ddc22a8..0112f9687 100644 --- a/MatterControlLib/PartPreviewWindow/Tabs.cs +++ b/MatterControlLib/PartPreviewWindow/Tabs.cs @@ -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); } } diff --git a/MatterControlLib/PartPreviewWindow/Toolbar.cs b/MatterControlLib/PartPreviewWindow/Toolbar.cs index 4321bc126..f31c55e6e 100644 --- a/MatterControlLib/PartPreviewWindow/Toolbar.cs +++ b/MatterControlLib/PartPreviewWindow/Toolbar.cs @@ -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) diff --git a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs index 02000e57b..11e4de78b 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs @@ -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) diff --git a/MatterControlLib/SlicerConfiguration/SettingsRow.cs b/MatterControlLib/SlicerConfiguration/SettingsRow.cs index 46490a943..675b4c7b6 100644 --- a/MatterControlLib/SlicerConfiguration/SettingsRow.cs +++ b/MatterControlLib/SlicerConfiguration/SettingsRow.cs @@ -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) diff --git a/MatterControlLib/Utilities/MarkdigAgg/AggListRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/AggListRenderer.cs index 236fc57e3..ec75b0e6f 100644 --- a/MatterControlLib/Utilities/MarkdigAgg/AggListRenderer.cs +++ b/MatterControlLib/Utilities/MarkdigAgg/AggListRenderer.cs @@ -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); } } diff --git a/MatterControlLib/Utilities/MarkdigAgg/HeadingRowX.cs b/MatterControlLib/Utilities/MarkdigAgg/HeadingRowX.cs index a26d728d0..3cdae2ea1 100644 --- a/MatterControlLib/Utilities/MarkdigAgg/HeadingRowX.cs +++ b/MatterControlLib/Utilities/MarkdigAgg/HeadingRowX.cs @@ -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); } } } diff --git a/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggCodeInlineRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggCodeInlineRenderer.cs index 2b16ec1fd..1fa2ac175 100644 --- a/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggCodeInlineRenderer.cs +++ b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggCodeInlineRenderer.cs @@ -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); } } diff --git a/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggEmphasisInlineRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggEmphasisInlineRenderer.cs index 4fc29dd8b..c665e1df9 100644 --- a/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggEmphasisInlineRenderer.cs +++ b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggEmphasisInlineRenderer.cs @@ -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); } } diff --git a/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggLinkInlineRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggLinkInlineRenderer.cs index c1d234638..85235a9ad 100644 --- a/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggLinkInlineRenderer.cs +++ b/MatterControlLib/Utilities/MarkdigAgg/Inlines/AggLinkInlineRenderer.cs @@ -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); } }