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

Put in the ability to get the size of the tab bar for the queue window

Browse source 
Made the tab bar fit to children so it holds all it's buttons
Made the first panel always fit the size of the queue tab bar
put in a layers description for z gap in settings
This commit is contained in:
Lars Brubaker 2015-01-07 16:11:12 -08:00
parent e665065308
commit 4afadaffc1
4 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ApplicationView/CompactSlidePanel.cs
View file

@ -69,6 +69,8 @@ namespace MatterHackers.MatterControl
get { return GetPanel(1); }
}
public double TabBarWidth { get { return mainControlsTabControl.Width; } }
static int lastPanelIndexBeforeReload = 0;
public CompactSlidePanel(QueueDataView queueDataView)
: base(2)
@ -108,6 +110,8 @@ namespace MatterHackers.MatterControl
mainControlsTabControl.TabBar.AddChild(hSpacer);
mainControlsTabControl.TabBar.AddChild(advancedControlsLinkButton);
mainControlsTabControl.TabBar.HAnchor = HAnchor.Max_FitToChildren_ParentWidth;
mainControlsTabControl.HAnchor = HAnchor.Max_FitToChildren_ParentWidth;
this.LeftPanel.AddChild(mainControlsTabControl);
}

2
ApplicationView/FirstPanelTabView.cs
View file

@ -51,7 +51,7 @@ using MatterHackers.MatterControl.PrintHistory;
namespace MatterHackers.MatterControl
{
class FirstPanelTabView : TabControl
public class FirstPanelTabView : TabControl
{
public static int firstPanelCurrentTab = 0;

17
ApplicationView/WidescreenPanel.cs
View file

@ -57,7 +57,6 @@ namespace MatterHackers.MatterControl
static readonly int ColumnOneFixedWidth = 590;
static int lastNumberOfVisiblePanels;
public TabPage AboutTabPage;
TextImageButtonFactory advancedControlsButtonFactory = new TextImageButtonFactory();
RGBA_Bytes unselectedTextColor = ActiveTheme.Instance.TabLabelUnselected;
@ -145,27 +144,18 @@ namespace MatterHackers.MatterControl
}
}
CompactSlidePanel compactSlidePanel;
void LoadCompactView()
{
queueDataView = new QueueDataView();
ColumnOne.RemoveAllChildren();
ColumnOne.AddChild(new ActionBarPlus(queueDataView));
ColumnOne.AddChild(new CompactSlidePanel(queueDataView));
compactSlidePanel = new CompactSlidePanel(queueDataView);
ColumnOne.AddChild(compactSlidePanel);
ColumnOne.AnchorAll();
}
void LoadColumnOne()
{
queueDataView = new QueueDataView();
ColumnOne.VAnchor = VAnchor.ParentBottomTop;
ColumnOne.AddChild(new ActionBarPlus(queueDataView));
ColumnOne.AddChild(new PrintProgressBar());
ColumnOne.AddChild(new FirstPanelTabView(queueDataView));
ColumnOne.Width = ColumnOneFixedWidth; //Ordering here matters - must go after children are added
}
void LoadColumnTwo(object state = null)
{
ColumnTwo.CloseAndRemoveAllChildren();
@ -242,6 +232,7 @@ namespace MatterHackers.MatterControl
ColumnTwo.Visible = true;
ColumnOne.HAnchor = Agg.UI.HAnchor.None;
ColumnOne.Width = ColumnOneFixedWidth; // it can hold the slice settings so it needs to be bigger.
ColumnOne.MinimumSize = new Vector2(Math.Max(compactSlidePanel.TabBarWidth, ColumnOneFixedWidth), 0); //Ordering here matters - must go after children are added
break;
}
}

2
StaticData/SliceSettings/Properties.json
View file

@ -939,7 +939,7 @@
"PresentationName": "Z Gap",
"HelpText": "The number of layers to skip in z. The gap between the support and the model.",
"DataEditType": "INT",
"ExtraSettings": ""
"ExtraSettings": "layers"
},
{
"SlicerConfigName": "support_material",