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

Refactoring

Browse source
This commit is contained in:
Lars Brubaker 2021-07-07 18:06:06 -07:00
parent e9f15ed991
commit 824bd9e8ba
5 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MatterControlLib/AboutPage/UpdateControlData.cs
View file

@ -112,11 +112,9 @@ namespace MatterHackers.MatterControl
if (this.UpdateRequired && !haveShowUpdateRequired)
{
haveShowUpdateRequired = true;
if (!UserSettings.Instance.IsTouchScreen)
if (!GuiWidget.TouchScreenMode)
{
#if !__ANDROID__
UiThread.RunOnIdle(() => DialogWindow.Show<CheckForUpdatesPage>());
#endif
}
}
}

2
MatterControlLib/PartPreviewWindow/LibraryBrowserPage.cs
View file

@ -99,7 +99,7 @@ namespace MatterHackers.MatterControl
public override void OnLoad(EventArgs args)
{
if (itemNameWidget != null
&& !UserSettings.Instance.IsTouchScreen)
&& !GuiWidget.TouchScreenMode)
{
UiThread.RunOnIdle(itemNameWidget.Focus);
}

2
MatterControlLib/PrinterControls/JogControls.cs
View file

@ -291,7 +291,7 @@ namespace MatterHackers.MatterControl
{
HAnchor = HAnchor.Center,
Margin = new BorderDouble(5),
Visible = !UserSettings.Instance.IsTouchScreen,
Visible = !GuiWidget.TouchScreenMode,
Enabled = false,
Selectable = false
};

4
MatterControlLib/RootSystemWindow.cs
View file

@ -68,7 +68,7 @@ namespace MatterHackers.MatterControl
GuiWidget.DefaultEnforceIntegerBounds = true;
// TODO: Needs review - doesn't seem like we want to scale on Touchscreen, rather we want device specific, configuration based scaling. Suggest remove
if (UserSettings.Instance.IsTouchScreen)
if (GuiWidget.TouchScreenMode)
{
// TODO: This steps on user scaling
GuiWidget.DeviceScale = 1.3;
@ -126,7 +126,7 @@ namespace MatterHackers.MatterControl
{
int width = 0;
int height = 0;
if (UserSettings.Instance.IsTouchScreen)
if (GuiWidget.TouchScreenMode)
{
minSize = new Vector2(800, 480);
}

13
MatterControlLib/SettingsManagement/UserSettings.cs
View file

@ -127,7 +127,7 @@ namespace MatterHackers.MatterControl
if (globalInstance == null)
{
globalInstance = new UserSettings();
ToolTipManager.AllowToolTips = !UserSettings.Instance.IsTouchScreen;
ToolTipManager.AllowToolTips = !GuiWidget.TouchScreenMode;
}
}
}
@ -242,11 +242,7 @@ namespace MatterHackers.MatterControl
{
get
{
#if __ANDROID__
return true;
#else
return this.get(UserSettingsKey.ApplicationDisplayMode) == "touchscreen";
#endif
}
}
@ -254,19 +250,14 @@ namespace MatterHackers.MatterControl
{
get
{
#if __ANDROID__
// Always use flat thumbnails on Android - at least until alpha glitch is resolve and compute cost for thumbnails is reduced
return "orthographic";
#else
string renderingMode = this.get(UserSettingsKey.ThumbnailRenderingMode);
if (string.IsNullOrWhiteSpace(renderingMode))
{
// If the current value is unset or invalid, use platform defaults
return UserSettings.Instance.IsTouchScreen ? "orthographic" : "raytraced";
return GuiWidget.TouchScreenMode ? "orthographic" : "raytraced";
}
return renderingMode;
#endif
}
set