From 7a062a2cb2cbfc9ef85f1697a5c51acd900dc6c1 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Thu, 19 Jan 2017 10:35:42 -0800 Subject: [PATCH] Make system window control if in single os screen mode. --- MatterControlApplication.cs | 1 + PartPreviewWindow/PartPreviewContent.cs | 2 +- Submodules/MatterSlice | 2 +- Submodules/agg-sharp | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/MatterControlApplication.cs b/MatterControlApplication.cs index 7e4fc4a2a..17ad0b8b7 100644 --- a/MatterControlApplication.cs +++ b/MatterControlApplication.cs @@ -262,6 +262,7 @@ namespace MatterHackers.MatterControl if (UserSettings.Instance.DisplayMode == ApplicationDisplayType.Touchscreen) { GuiWidget.DeviceScale = 1.3; + SystemWindow.ShareSingleOsWindow = true; } //GuiWidget.DeviceScale = 2; diff --git a/PartPreviewWindow/PartPreviewContent.cs b/PartPreviewWindow/PartPreviewContent.cs index 38155b6b9..56719737f 100644 --- a/PartPreviewWindow/PartPreviewContent.cs +++ b/PartPreviewWindow/PartPreviewContent.cs @@ -132,7 +132,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow int tabPointSize = 16; // add the correct tabs based on whether we are stand alone or embedded Tab threeDViewTab; - if (windowMode == View3DWidget.WindowMode.StandAlone || OsInformation.OperatingSystem == OSType.Android) + if (windowMode == View3DWidget.WindowMode.StandAlone || UserSettings.Instance.IsTouchScreen) { threeDViewTab = new SimpleTextTabWidget(partPreview3DView, "3D View Tab", tabPointSize, selectedTabColor, new RGBA_Bytes(), ActiveTheme.Instance.TabLabelUnselected, new RGBA_Bytes()); diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index 32659677d..ce0c34922 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit 32659677d7b7e0c81975952597c98dcf280d24b5 +Subproject commit ce0c349229384d01549adf6849ed9f2bf6c4b22c diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 27ea5515d..2fa5b11bc 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 27ea5515d7b536d69d0be8593e7936160177034f +Subproject commit 2fa5b11bc8d89d15e5c9e57896bd3fe5b13cf77f