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

Fix path to ScrollableWidget, remove dead code

Browse source
This commit is contained in:
John Lewin 2017-02-24 08:39:31 -08:00
parent 476a81479c
commit 6bdcc19dd2
2 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ApplicationView/AdvancedControlsPanel.cs
View file

@ -116,13 +116,6 @@ namespace MatterHackers.MatterControl
advancedControls.TabBar.AddChild(new HorizontalSpacer()); 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; RGBA_Bytes unselectedTextColor = ActiveTheme.Instance.TabLabelUnselected;
if (ActiveSliceSettings.Instance.PrinterSelected) if (ActiveSliceSettings.Instance.PrinterSelected)
@ -138,7 +131,7 @@ namespace MatterHackers.MatterControl
var sliceSettingPopOut = new PopOutTextTabWidget(sliceSettingsTabPage, SliceSettingsTabName, new Vector2(590, 400), textSize); var sliceSettingPopOut = new PopOutTextTabWidget(sliceSettingsTabPage, SliceSettingsTabName, new Vector2(590, 400), textSize);
advancedControls.AddTab(sliceSettingPopOut); 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); var controlsPopOut = new PopOutTextTabWidget(controlsTabPage, ControlsTabName, new Vector2(400, 300), textSize);
advancedControls.AddTab(controlsPopOut); advancedControls.AddTab(controlsPopOut);

2
Tests/MatterControl.AutomationTests/PrintingTests.cs
View file

@ -138,7 +138,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
var container = testRunner.GetWidgetByName("ManualPrinterControls.ControlsContainer", out systemWindow, 5); var container = testRunner.GetWidgetByName("ManualPrinterControls.ControlsContainer", out systemWindow, 5);
// Scroll the widget into view // Scroll the widget into view
var scrollable = container.Parents<ManualPrinterControls>().First().Parents<ScrollableWidget>().First(); var scrollable = container.Parents<ManualPrinterControls>().First().Children<ScrollableWidget>().First();
var width = scrollable.Width; var width = scrollable.Width;
// Workaround needed to scroll to the bottom of the Controls panel // Workaround needed to scroll to the bottom of the Controls panel