From e7fa5fc3b81d677aa9d8d141e0ea5fa2373adfc3 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Mon, 23 Jan 2017 17:19:59 -0800 Subject: [PATCH] Make sure we always show the selector on non-android. --- .../ApplicationSettings/ApplicationSettingsView.cs | 3 ++- Submodules/MatterSlice | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs b/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs index c0f57f035..30fe106da 100644 --- a/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs +++ b/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs @@ -78,7 +78,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage } - if (!UserSettings.Instance.IsTouchScreen) + #if !__ANDROID__ { mainContainer.AddChild(GetThumbnailRenderingControl()); mainContainer.AddChild(new HorizontalLine(separatorLineColor)); @@ -86,6 +86,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage mainContainer.AddChild(GetDisplayControl()); mainContainer.AddChild(new HorizontalLine(separatorLineColor)); } + #endif if (UserSettings.Instance.IsTouchScreen) { diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index cc80ff4c4..f9a08821b 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit cc80ff4c4a9de75ad442d295a19e76826b72b59c +Subproject commit f9a08821b3a8e494d5217a0d2ef30d9b7cb51757