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

Merge pull request #285 from gregory-diaz/1.2.3

Browse source 
Added 'Manual Controls' tab to scrollable widget for 'Touchscreen' di…
This commit is contained in:
Lars Brubaker 2015-06-08 17:44:43 -07:00
commit 15435c8b5c
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ApplicationView/CompactTabView.cs
View file

@ -118,10 +118,18 @@ namespace MatterHackers.MatterControl
GuiWidget manualPrinterControls = new ManualControlsWidget();
ScrollableWidget manualPrinterControlsScrollArea = new ScrollableWidget(true);
manualPrinterControlsScrollArea.ScrollArea.HAnchor |= Agg.UI.HAnchor.ParentLeftRight;
manualPrinterControlsScrollArea.AnchorAll();
manualPrinterControlsScrollArea.AddChild(manualPrinterControls);
//Add the tab contents for 'Advanced Controls'
string printerControlsLabel = LocalizedString.Get("Controls").ToUpper();
manualControlsPage = new TabPage(manualPrinterControls, printerControlsLabel);
this.AddTab(new SimpleTextTabWidget(manualControlsPage, "Controls Tab", TabTextSize,
manualControlsPage = new TabPage(manualPrinterControlsScrollArea, printerControlsLabel);
this.AddTab(new SimpleTextTabWidget(manualControlsPage, "Controls Tab", TabTextSize,
ActiveTheme.Instance.SecondaryAccentColor, new RGBA_Bytes(), unselectedTextColor, new RGBA_Bytes()));
HorizontalLine lineSpacerOne = new HorizontalLine();

1
PrinterControls/ManualPrinterControls.cs
View file

@ -43,6 +43,7 @@ namespace MatterHackers.MatterControl
: base()
{
this.AnchorAll();
VAnchor = Agg.UI.VAnchor.Max_FitToChildren_ParentHeight;
this.BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor;
this.AddChild(new ManualPrinterControls());
}