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

Fix Android

Browse source
This commit is contained in:
John Lewin 2018-10-13 22:40:28 -07:00
parent afcfc6d143
commit 94e2bb1fa4
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
MatterControlLib/Library/Widgets/HardwarePage/PrinterDetails.cs
View file

@ -28,7 +28,9 @@ either expressed or implied, of the FreeBSD Project.
*/
#if !__ANDROID__
using Markdig.Agg;
#endif
using MatterHackers.Agg;
using MatterHackers.Agg.Image;
using MatterHackers.Agg.UI;
@ -125,6 +127,7 @@ namespace MatterHackers.MatterControl.Library.Widgets.HardwarePage
Padding = theme.DefaultContainerPadding
};
#if !__ANDROID__
var description = new MarkdownWidget(theme)
{
MinimumSize = new VectorMath.Vector2(350, 0),
@ -133,7 +136,7 @@ namespace MatterHackers.MatterControl.Library.Widgets.HardwarePage
Markdown = product.ProductDescription.Trim()
};
descriptionBackground.AddChild(description);
#endif
descriptionBackground.BeforeDraw += (s, e) =>
{
var rect = new RoundedRect(descriptionBackground.LocalBounds, 3);

8
MatterControlLib/PartPreviewWindow/PartPreviewContent.cs
View file

@ -233,13 +233,13 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// Hardware tab
tabControl.AddTab(
new ChromeTab("Hardware",
"Hardware".Localize(),
tabControl,
new ChromeTab("Hardware",
"Hardware".Localize(),
tabControl,
new HardwareTabPage(theme)
{
BackgroundColor = theme.ActiveTabColor
},
},
theme,
hasClose: false)
{

1
MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs
View file

@ -38,6 +38,7 @@ using MatterHackers.Localizations;
using MatterHackers.MatterControl.ConfigurationPage;
using MatterHackers.MatterControl.CustomWidgets;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.SlicerConfiguration;
using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl