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

Merge pull request #3769 from jlewin/master

Browse source 
Fix Android
This commit is contained in:
johnlewin 2018-09-29 22:13:09 -07:00 • committed by GitHub
commit 0b78f3c2c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
MatterControlLib/CustomWidgets/SimpleButton.cs
View file

@ -34,7 +34,6 @@ using MatterHackers.Agg;
using MatterHackers.Agg.Image;
using MatterHackers.Agg.UI;
using MatterHackers.ImageProcessing;
using static MatterHackers.MatterControl.ApplicationSettingsPage;
namespace MatterHackers.MatterControl.CustomWidgets
{

3
MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs
View file

@ -90,7 +90,8 @@ namespace MatterHackers.MatterControl
}
},
previewButton,
AggContext.StaticData.LoadIcon("camera-24x24.png", 24, 24))
AggContext.StaticData.LoadIcon("camera-24x24.png", 24, 24)),
generalPanel
);
#endif
// Print Notifications