Make system window control if in single os screen mode.

This commit is contained in:
Lars Brubaker 2017-01-19 10:35:42 -08:00
parent e086f6058d
commit 7a062a2cb2
4 changed files with 4 additions and 3 deletions

View file

@ -262,6 +262,7 @@ namespace MatterHackers.MatterControl
if (UserSettings.Instance.DisplayMode == ApplicationDisplayType.Touchscreen)
{
GuiWidget.DeviceScale = 1.3;
SystemWindow.ShareSingleOsWindow = true;
}
//GuiWidget.DeviceScale = 2;

View file

@ -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());

@ -1 +1 @@
Subproject commit 32659677d7b7e0c81975952597c98dcf280d24b5
Subproject commit ce0c349229384d01549adf6849ed9f2bf6c4b22c

@ -1 +1 @@
Subproject commit 27ea5515d7b536d69d0be8593e7936160177034f
Subproject commit 2fa5b11bc8d89d15e5c9e57896bd3fe5b13cf77f