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

Fix: Scroll bar disappears from Controls page in touchscreen mode

Browse source 
MatterHackers/MatterControl#1369
This commit is contained in:
Greg 2016-09-29 13:42:06 -07:00
parent 329be79732
commit 88ec6c6283
1 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
ApplicationView/TouchscreenTabView.cs
View file

@ -122,26 +122,20 @@ namespace MatterHackers.MatterControl
HorizontalLine lineSpacerZero = new HorizontalLine();
lineSpacerZero.Margin = new BorderDouble(4, 10);
this.TabBar.AddChild(lineSpacerZero);
GuiWidget manualPrinterControls = new ManualControlsWidget();
#if __ANDROID__
//Add the tab contents for 'Advanced Controls'
GuiWidget manualPrinterControls = new ManualControlsWidget();
string printerControlsLabel = LocalizedString.Get("Controls").ToUpper();
manualControlsPage = new TabPage(manualPrinterControls, printerControlsLabel);
this.AddTab(new SimpleTextTabWidget(manualControlsPage, "Controls Tab", TabTextSize,
ActiveTheme.Instance.SecondaryAccentColor, new RGBA_Bytes(), unselectedTextColor, new RGBA_Bytes()));
#else
ScrollableWidget manualPrinterControlsScrollArea = new ScrollableWidget(true);
manualPrinterControlsScrollArea.ScrollArea.HAnchor |= Agg.UI.HAnchor.ParentLeftRight;
manualPrinterControlsScrollArea.AnchorAll();
manualPrinterControlsScrollArea.AddChild(manualPrinterControls);
//Add the tab contents for 'Advanced Controls'
ScrollableWidget manualPrinterControlsScrollArea = CreateManualControlsTab();
string printerControlsLabel = LocalizedString.Get("Controls").ToUpper();
manualControlsPage = new TabPage(manualPrinterControlsScrollArea, printerControlsLabel);
manualControlsPage = new TabPage(manualPrinterControlsScrollArea, printerControlsLabel);
this.AddTab(new SimpleTextTabWidget(manualControlsPage, "Controls Tab", TabTextSize,
this.AddTab(new SimpleTextTabWidget(manualControlsPage, "Controls Tab", TabTextSize,
ActiveTheme.Instance.SecondaryAccentColor, new RGBA_Bytes(), unselectedTextColor, new RGBA_Bytes()));
#endif
@ -246,6 +240,18 @@ namespace MatterHackers.MatterControl
}
private event EventHandler unregisterEvents;
private ScrollableWidget CreateManualControlsTab()
{
GuiWidget manualPrinterControls = new ManualControlsWidget();
ScrollableWidget manualPrinterControlsScrollArea = new ScrollableWidget(true);
manualPrinterControlsScrollArea.ScrollArea.HAnchor |= Agg.UI.HAnchor.ParentLeftRight;
manualPrinterControlsScrollArea.AnchorAll();
manualPrinterControlsScrollArea.AddChild(manualPrinterControls);
return manualPrinterControlsScrollArea;
}
public override void OnClosed(EventArgs e)
{
unregisterEvents?.Invoke(this, null);
@ -285,7 +291,8 @@ namespace MatterHackers.MatterControl
{
// ReloadControlsWidget
manualControlsPage.RemoveAllChildren();
manualControlsPage.AddChild(new ManualControlsWidget());
ScrollableWidget manualScroll = CreateManualControlsTab();
manualControlsPage.AddChild(manualScroll);
// ReloadConfigurationWidget
optionsPage.RemoveAllChildren();