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

Make sure we always show the selector on non-android.

Browse source
This commit is contained in:
Lars Brubaker 2017-01-23 17:19:59 -08:00
parent a5bd2744fc
commit e7fa5fc3b8
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs
View file

@ -78,7 +78,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
} }
if (!UserSettings.Instance.IsTouchScreen) #if !__ANDROID__
{ {
mainContainer.AddChild(GetThumbnailRenderingControl()); mainContainer.AddChild(GetThumbnailRenderingControl());
mainContainer.AddChild(new HorizontalLine(separatorLineColor)); mainContainer.AddChild(new HorizontalLine(separatorLineColor));
@ -86,6 +86,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
mainContainer.AddChild(GetDisplayControl()); mainContainer.AddChild(GetDisplayControl());
mainContainer.AddChild(new HorizontalLine(separatorLineColor)); mainContainer.AddChild(new HorizontalLine(separatorLineColor));
} }
#endif
if (UserSettings.Instance.IsTouchScreen) if (UserSettings.Instance.IsTouchScreen)
{ {

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit cc80ff4c4a9de75ad442d295a19e76826b72b59c Subproject commit f9a08821b3a8e494d5217a0d2ef30d9b7cb51757