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

Add support for text only TreeNodes

Browse source 
- Issue MatterHackers/MCCentral#3520
This commit is contained in:
John Lewin 2018-06-06 09:05:59 -07:00
parent ade6a529d3
commit f727fb2dc7
3 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
CustomWidgets/TreeView/TreeNode.cs
View file

@ -44,7 +44,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
{
private GuiWidget content;
public TreeNode()
public TreeNode(bool useIcon = true)
: base(FlowDirection.TopToBottom)
{
var theme = ApplicationController.Instance.Theme;
@ -77,31 +77,34 @@ namespace MatterHackers.MatterControl.CustomWidgets
VAnchor = VAnchor.Center,
};
this.ExpandedChanged += (s2, e2) =>
this.ExpandedChanged += (s, e) =>
{
expandWidget.Expanded = this.Expanded;
expandCheckBox.Checked = this.Expanded;
};
expandCheckBox.CheckedStateChanged += (s3, e3) =>
expandCheckBox.CheckedStateChanged += (s, e) =>
{
Expanded = expandCheckBox.Checked;
};
this.TitleBar.AddChild(expandCheckBox);
this.SelectionBar = new FlowLayoutWidget()
this.HighlightRegion = new FlowLayoutWidget()
{
VAnchor = VAnchor.Fit,
HAnchor = HAnchor.Fit,
Padding = useIcon ? 0 : new BorderDouble(4, 2),
Selectable = false
};
this.TitleBar.AddChild(this.SelectionBar);
this.TitleBar.AddChild(this.HighlightRegion);
// add a check box
if (Image != null)
if (useIcon)
{
this.SelectionBar.AddChild(imageWidget = new ImageWidget(this.Image)
_image = new ImageBuffer(16, 16);
this.HighlightRegion.AddChild(imageWidget = new ImageWidget(this.Image)
{
VAnchor = VAnchor.Center,
BackgroundColor = new Color(theme.Colors.PrimaryTextColor, 12),
@ -110,8 +113,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
});
};
this.SelectionBar.AddChild(textWidget = new TextWidget(this.Text, pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor)
this.HighlightRegion.AddChild(textWidget = new TextWidget(this.Text, pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor)
{
Selectable = false,
AutoExpandBoundsToText = true,
@ -132,7 +134,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
public FlowLayoutWidget TitleBar { get; }
public FlowLayoutWidget SelectionBar { get; }
public FlowLayoutWidget HighlightRegion { get; }
public void BeginEdit()
{
@ -223,7 +225,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
#region Properties
private ImageBuffer _image = new ImageBuffer(16, 16);
private ImageBuffer _image = null;
private TextWidget textWidget;
private TreeExpandWidget expandWidget;
private ImageWidget imageWidget;

4
CustomWidgets/TreeView/TreeView.cs
View file

@ -208,11 +208,11 @@ namespace MatterHackers.MatterControl.CustomWidgets
if (_selectedNode != null)
{
_selectedNode.SelectionBar.BackgroundColor = Color.Transparent;
_selectedNode.HighlightRegion.BackgroundColor = Color.Transparent;
}
_selectedNode = value;
_selectedNode.SelectionBar.BackgroundColor = theme.AccentMimimalOverlay;
_selectedNode.HighlightRegion.BackgroundColor = theme.AccentMimimalOverlay;
OnAfterSelect(null);
}
}

4
SetupWizard/DesignSpaceHelp.cs
View file

@ -303,7 +303,7 @@ namespace MatterHackers.MatterControl
}
};
var rootNode = new TreeNode()
var rootNode = new TreeNode(useIcon: false)
{
Text = "Help Guides",
TextColor = theme.Colors.PrimaryTextColor,
@ -326,7 +326,7 @@ namespace MatterHackers.MatterControl
foreach (var guide in ApplicationController.Instance.FeatureGuides.OrderBy(g => g.MenuName))
{
var treeNode = new TreeNode()
var treeNode = new TreeNode(useIcon: false)
{
Text = guide.MenuName,
Tag = guide,