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

Made the bed change on printer change

Browse source 
Started work on a publish to MatterHackers
This commit is contained in:
Lars Brubaker 2017-08-31 15:52:27 -07:00
parent 48bd174568
commit 611ff4799a
9 changed files with 199 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
AboutPage/HTMLParser/HtmlParser.cs
View file

@ -88,7 +88,10 @@ namespace MatterHackers.MatterControl.HtmlParsing
&& nextOpenPosition != -1)
{
string content = htmlContent.Substring(closePosition + 1, nextOpenPosition - closePosition - 1);
addContentFunction(this, content);
if (!string.IsNullOrWhiteSpace(content))
{
addContentFunction(this, content);
}
}
if (voidElements.Contains(elementQueue.Peek().typeName))

25
AboutPage/HTMLParser/HtmlWidget.cs
View file

@ -55,10 +55,12 @@ namespace MatterHackers.MatterControl
linkButtonFactory.fontSize = 12;
linkButtonFactory.textColor = aboutTextColor;
htmlParser.ParseHtml(htmlContent, AddContent, CloseContent);
VAnchor = VAnchor.Fit;
HAnchor = HAnchor.Stretch;
VAnchor = VAnchor.MaxFitOrStretch;
HAnchor = HAnchor.MaxFitOrStretch;
htmlContent = htmlContent.Replace("\r", "");
htmlContent = htmlContent.Replace("\n", "");
htmlParser.ParseHtml(htmlContent, AddContent, CloseContent);
}
public class WrappingTextWidget : GuiWidget
@ -101,6 +103,19 @@ namespace MatterHackers.MatterControl
}
}
public override void OnChildAdded(EventArgs e)
{
foreach (var child in Children)
{
if (child.VAnchor == VAnchor.Stretch)
{
this.VAnchor = VAnchor.Stretch;
}
}
base.OnChildAdded(e);
}
// Replace multiple white spaces with single whitespace
private static readonly Regex replaceMultipleWhiteSpacesWithSingleWhitespaceRegex = new Regex(@"\s+", RegexOptions.Compiled);
@ -141,7 +156,6 @@ namespace MatterHackers.MatterControl
if (decodedHtml != null && decodedHtml != "")
{
WrappingTextWidget content = new WrappingTextWidget(decodedHtml, pointSize: elementState.PointSize, textColor: ActiveTheme.Instance.PrimaryTextColor);
//content.VAnchor = VAnchor.Top;
elementsUnderConstruction.Peek().AddChild(content);
}
}
@ -247,7 +261,7 @@ namespace MatterHackers.MatterControl
{
if (elementState.Id == "sendFeedback")
{
createdButton.Click += (s, e) => ContactFormWindow.Open();
createdButton.Click += (s, e) => ContactFormWindow.Open();
}
else if (elementState.Id == "clearCache")
{
@ -269,6 +283,7 @@ namespace MatterHackers.MatterControl
if (elementState.SizePercent.y == 100)
{
elementsUnderConstruction.Peek().VAnchor = VAnchor.Stretch;
this.VAnchor = VAnchor.Stretch;
}
if (elementState.Alignment == ElementState.AlignType.center)
{