DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Robert 2023-07-27 20:47:17 +02:00
commit 8639cde83a
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml
View File

@ -45,7 +45,7 @@
</Grid> </Grid>
<Border Classes="card-separator" /> <Border Classes="card-separator" />
<Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto"> <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto" IsVisible="{CompiledBinding IsWindows11}">
<StackPanel Grid.Column="0"> <StackPanel Grid.Column="0">
<TextBlock>Enable Mica effect</TextBlock> <TextBlock>Enable Mica effect</TextBlock>
<TextBlock Classes="subtitle" TextWrapping="Wrap"> <TextBlock Classes="subtitle" TextWrapping="Wrap">
@ -56,7 +56,7 @@
<ToggleSwitch IsChecked="{CompiledBinding EnableMica.Value}" OnContent="Yes" OffContent="No" MinWidth="0" Margin="0 -10" /> <ToggleSwitch IsChecked="{CompiledBinding EnableMica.Value}" OnContent="Yes" OffContent="No" MinWidth="0" Margin="0 -10" />
</StackPanel> </StackPanel>
</Grid> </Grid>
<Border Classes="card-separator" /> <Border Classes="card-separator" IsVisible="{CompiledBinding IsWindows11}"/>
<Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto"> <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
<StackPanel Grid.Column="0"> <StackPanel Grid.Column="0">

2
src/Artemis.UI/Screens/Settings/Tabs/GeneralTabViewModel.cs
View File

@ -20,6 +20,7 @@ using Artemis.UI.Shared.Services.Builders;
using Avalonia.Threading; using Avalonia.Threading;
using DryIoc; using DryIoc;
using DynamicData; using DynamicData;
using FluentAvalonia.Interop;
using ReactiveUI; using ReactiveUI;
using Serilog.Events; using Serilog.Events;
@ -95,6 +96,7 @@ public class GeneralTabViewModel : ActivatableViewModelBase
public ReactiveCommand<Unit, Unit> ShowDataFolder { get; } public ReactiveCommand<Unit, Unit> ShowDataFolder { get; }
public bool IsAutoRunSupported => _autoRunProvider != null; public bool IsAutoRunSupported => _autoRunProvider != null;
public bool IsWindows11 => OSVersionHelper.IsWindows11();
public ObservableCollection<LayerBrushDescriptor> LayerBrushDescriptors { get; } public ObservableCollection<LayerBrushDescriptor> LayerBrushDescriptors { get; }
public ObservableCollection<string> GraphicsContexts { get; } public ObservableCollection<string> GraphicsContexts { get; }

2
src/Artemis.props
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<AvaloniaVersion>11.0.1</AvaloniaVersion> <AvaloniaVersion>11.0.1</AvaloniaVersion>
<FluentAvaloniaVersion>2.0.0</FluentAvaloniaVersion> <FluentAvaloniaVersion>2.0.0</FluentAvaloniaVersion>
<RGBDotNetVersion>2.0.0-prerelease.83</RGBDotNetVersion> <RGBDotNetVersion>2.0.0-prerelease.94</RGBDotNetVersion>
<SkiaSharpVersion>2.88.3</SkiaSharpVersion> <SkiaSharpVersion>2.88.3</SkiaSharpVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>