DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 11:56:30 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/development' into development

Browse Source
This commit is contained in:
Robert committed 2021-03-26 00:18:16 +01:00
2 parents 5611ad420a 0a7c724de0
commit cf25d9f146
15 files changed
+154 -72
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabViewModel.cs
+6 -3
View File
@@ -59,9 +59,12 @@ namespace Artemis.UI.Screens.Settings.Tabs.General
LogLevels = new BindableCollection<ValueDescription>(EnumUtilities.GetAllValuesAndDescriptions(typeof(LogEventLevel)));
ColorSchemes = new BindableCollection<ValueDescription>(EnumUtilities.GetAllValuesAndDescriptions(typeof(ApplicationColorScheme)));
RenderScales = new List<Tuple<string, double>> {new("10%", 0.1)};
for (int i = 25; i <= 100; i += 25)
RenderScales.Add(new Tuple<string, double>(i + "%", i / 100.0));
RenderScales = new List<Tuple<string, double>>
{
new("25%", 0.25),
new("50%", 0.5),
new("100%", 1),
};
TargetFrameRates = new List<Tuple<string, int>>();
for (int i = 10; i <= 30; i += 5)