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

Rename GuiWidget find descendant helpers

Browse source
This commit is contained in:
John Lewin 2018-12-29 16:37:17 -08:00
parent cb6abce2da
commit af142f6992
7 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControl.Winforms/InspectForm.cs
View file

@ -345,7 +345,7 @@ namespace MatterHackers.MatterControl
&& tabControl1.SelectedIndex == 0)
{
var namedChildren = new List<GuiWidget.WidgetAndPosition>();
inspectedSystemWindow.FindNamedChildrenRecursive(
inspectedSystemWindow.FindDescendants(
"",
namedChildren,
new RectangleDouble(mousePosition.X, mousePosition.Y, mousePosition.X + 1, mousePosition.Y + 1),

2
MatterControlLib/AboutPage/UpdateControlData.cs
View file

@ -225,7 +225,7 @@ namespace MatterHackers.MatterControl
{
InitiateUpdateDownload();
// Switch to the about page so we can see the download progress.
GuiWidget aboutTabWidget = ApplicationController.Instance.MainView.FindNamedChildRecursive("About Tab");
GuiWidget aboutTabWidget = ApplicationController.Instance.MainView.FindDescendant("About Tab");
if (aboutTabWidget is Tab aboutTab)
{

2
MatterControlLib/ActionBar/TemperatureWidgetExtruder.cs
View file

@ -352,7 +352,7 @@ namespace MatterHackers.MatterControl.ActionBar
// Hide TextWidget
presetsSelector.Children.First().Visible = false;
var pulldownContainer = presetsSelector.FindNamedChildRecursive("Preset Pulldown Container");
var pulldownContainer = presetsSelector.FindDescendant("Preset Pulldown Container");
if (pulldownContainer != null)
{
pulldownContainer.Padding = menuTheme.ToolbarPadding;

2
MatterControlLib/PartPreviewWindow/PrinterTabPage.cs
View file

@ -185,7 +185,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
modelViewSidePanel.Width = gcodeContainer.Width;
};
var splitContainer = view3DWidget.FindNamedChildRecursive("SplitContainer");
var splitContainer = view3DWidget.FindDescendant("SplitContainer");
splitContainer.AddChild(gcodeContainer);

4
MatterControlLib/PartPreviewWindow/View3D/MeshViewerWidget.cs
View file

@ -333,7 +333,7 @@ namespace MatterHackers.MeshVisualizer
base.OnClosed(e);
}
public override void FindNamedChildrenRecursive(string nameToSearchFor, List<WidgetAndPosition> foundChildren, RectangleDouble touchingBounds, SearchType seachType, bool allowInvalidItems = true)
public override List<WidgetAndPosition> FindDescendants(string nameToSearchFor, List<WidgetAndPosition> foundChildren, RectangleDouble touchingBounds, SearchType seachType, bool allowInvalidItems = true)
{
foreach (InteractionVolume child in interactionLayer.InteractionVolumes)
{
@ -429,7 +429,7 @@ namespace MatterHackers.MeshVisualizer
}
}
base.FindNamedChildrenRecursive(nameToSearchFor, foundChildren, touchingBounds, seachType, allowInvalidItems);
return base.FindDescendants(nameToSearchFor, foundChildren, touchingBounds, seachType, allowInvalidItems);
}
public static Color GetExtruderColor(int extruderIndex)

3
MatterControlLib/SetupWizard/TourOverlay.cs
View file

@ -84,8 +84,7 @@ namespace MatterControlLib.SetupWizard
GuiWidget tourLocationWidget = null;
while (checkLocation < tourLocations.Count)
{
var foundChildren = new List<GuiWidget.WidgetAndPosition>();
window.FindNamedChildrenRecursive(tourLocations[checkLocation].WidgetName, foundChildren);
var foundChildren = window.FindDescendants(tourLocations[checkLocation].WidgetName);
GuiWidget foundLocation = null;
foreach (var widgetAndPosition in foundChildren)

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit f41ca0ff7c45c6d8a397565ca62ba97927075c45
Subproject commit 4ca87fd2858405b708470cddba233cb497213fcd