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

Filter and search SliceSettings views

Browse source 
- Issue MatterHackers/MCCentral#2651
- Issue MatterHackers/MCCentral#2650
- Issue MatterHackers/MCCentral#2649
ShowHelp in Configure Printer not synced with SliceSettingsWidget
This commit is contained in:
John Lewin 2018-01-14 10:36:05 -08:00
parent 80ae5d9bef
commit 918ab7de76
9 changed files with 325 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

28
PartPreviewWindow/Toolbar.cs
View file

@ -42,8 +42,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
/// </summary>
public class Toolbar : GuiWidget
{
public FlowLayoutWidget ActionArea { get; }
public Toolbar(GuiWidget rightAnchorItem = null)
{
this.ActionArea = new FlowLayoutWidget()
@ -55,6 +53,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.SetRightAnchorItem(rightAnchorItem);
}
public FlowLayoutWidget ActionArea { get; }
public GuiWidget RightAnchorItem { get; private set; }
protected void SetRightAnchorItem(GuiWidget rightAnchorItem)
{
if (rightAnchorItem != null)
@ -62,6 +64,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
rightAnchorItem.HAnchor |= HAnchor.Right;
base.AddChild(rightAnchorItem);
}
this.RightAnchorItem = rightAnchorItem;
}
public override void AddChild(GuiWidget childToAdd, int indexInChildrenList = -1)
@ -82,23 +86,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
public Toolbar TabBar { get; }
protected GuiWidget tabBody;
public GuiWidget TabContainer { get; protected set; }
public SimpleTabs(GuiWidget rightAnchorItem)
: this(
new GuiWidget()
{
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Stretch,
},
rightAnchorItem)
{
}
public SimpleTabs(GuiWidget tabBody, GuiWidget rightAnchorItem)
: base(FlowDirection.TopToBottom)
{
this.tabBody = tabBody;
this.AddChild(TabBar = new Toolbar(rightAnchorItem)
{
@ -106,7 +98,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
VAnchor = VAnchor.Fit
});
this.AddChild(tabBody);
this.TabContainer = this;
}
public event EventHandler ActiveTabChanged;
@ -127,7 +119,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.TabBar.ActionArea.AddChild(tabWidget, position);
this.tabBody.AddChild(iTab.TabContent);
this.TabContainer.AddChild(iTab.TabContent);
}
private void TabWidget_Click(object sender, MouseEventArgs e)
@ -150,7 +142,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
_allTabs.Remove(tab);
TabBar.ActionArea.RemoveChild(tab as GuiWidget);
tabBody.RemoveChild(tab.TabContent);
this.TabContainer.RemoveChild(tab.TabContent);
ActiveTab = _allTabs.LastOrDefault();
}