Merge branch 'development' into VisualScripting

This commit is contained in:
Robert committed 2021-09-12 13:00:58 +02:00
commit 2a6c004aa6
28 files changed
+252 -126

No files matched your search

@@ -343,8 +343,7 @@
<StackPanel Grid.Column="0">
<TextBlock Style="{StaticResource MaterialDesignTextBlock}">Render scale</TextBlock>
<TextBlock Style="{StaticResource MaterialDesignTextBlock}" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}" TextWrapping="Wrap">
Sets the resolution Artemis renders at, higher scale means more CPU-usage, especially on large surfaces. <LineBreak />
<Run Foreground="GoldenRod">A scale of 25% may be required for very large surfaces but could cause LED dimming or bleeding.</Run>
Sets the resolution Artemis renders at, higher scale means more CPU-usage, especially on large surfaces.
</TextBlock>
</StackPanel>
<StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
@@ -216,11 +216,11 @@ namespace Artemis.UI.Screens.Settings.Tabs.General
public double RenderScale
{
get => _settingsService.GetSetting("Core.RenderScale", 0.5).Value;
get => _settingsService.GetSetting("Core.RenderScale", 0.25).Value;
set
{
_settingsService.GetSetting("Core.RenderScale", 0.5).Value = value;
_settingsService.GetSetting("Core.RenderScale", 0.5).Save();
_settingsService.GetSetting("Core.RenderScale", 0.25).Value = value;
_settingsService.GetSetting("Core.RenderScale", 0.25).Save();
}
}