From 6bdcc19dd2a62ffce27bd0c8f91ba7cbbbbe5585 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Fri, 24 Feb 2017 08:39:31 -0800 Subject: [PATCH] Fix path to ScrollableWidget, remove dead code --- ApplicationView/AdvancedControlsPanel.cs | 9 +-------- Tests/MatterControl.AutomationTests/PrintingTests.cs | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/ApplicationView/AdvancedControlsPanel.cs b/ApplicationView/AdvancedControlsPanel.cs index 6a34ce137..ff9610beb 100644 --- a/ApplicationView/AdvancedControlsPanel.cs +++ b/ApplicationView/AdvancedControlsPanel.cs @@ -116,13 +116,6 @@ namespace MatterHackers.MatterControl advancedControls.TabBar.AddChild(new HorizontalSpacer()); - GuiWidget manualPrinterControls = new ManualPrinterControls(); - - ScrollableWidget manualPrinterControlsScrollArea = new ScrollableWidget(true); - manualPrinterControlsScrollArea.ScrollArea.HAnchor |= HAnchor.ParentLeftRight; - manualPrinterControlsScrollArea.AnchorAll(); - //manualPrinterControlsScrollArea.AddChild(manualPrinterControls); - RGBA_Bytes unselectedTextColor = ActiveTheme.Instance.TabLabelUnselected; if (ActiveSliceSettings.Instance.PrinterSelected) @@ -138,7 +131,7 @@ namespace MatterHackers.MatterControl var sliceSettingPopOut = new PopOutTextTabWidget(sliceSettingsTabPage, SliceSettingsTabName, new Vector2(590, 400), textSize); advancedControls.AddTab(sliceSettingPopOut); - var controlsTabPage = new TabPage(manualPrinterControls, "Controls".Localize().ToUpper()); + var controlsTabPage = new TabPage(new ManualPrinterControls(), "Controls".Localize().ToUpper()); var controlsPopOut = new PopOutTextTabWidget(controlsTabPage, ControlsTabName, new Vector2(400, 300), textSize); advancedControls.AddTab(controlsPopOut); diff --git a/Tests/MatterControl.AutomationTests/PrintingTests.cs b/Tests/MatterControl.AutomationTests/PrintingTests.cs index 4561d884f..4a518a3ed 100644 --- a/Tests/MatterControl.AutomationTests/PrintingTests.cs +++ b/Tests/MatterControl.AutomationTests/PrintingTests.cs @@ -138,7 +138,7 @@ namespace MatterHackers.MatterControl.Tests.Automation var container = testRunner.GetWidgetByName("ManualPrinterControls.ControlsContainer", out systemWindow, 5); // Scroll the widget into view - var scrollable = container.Parents().First().Parents().First(); + var scrollable = container.Parents().First().Children().First(); var width = scrollable.Width; // Workaround needed to scroll to the bottom of the Controls panel