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

Profiles - Abstracted property elements and effect elements

Browse Source 
Folders - Added properties to folders
Layer effects - Expanded to folders
Layer effects - Added shape clipping
This commit is contained in:
SpoinkyNL committed 2020-06-17 19:21:23 +02:00
1 parent 1a637f7f95
commit 9f778d840f
42 files changed
+638 -347
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/PropertyInput/BrushPropertyInputViewModel.cs
+5 -2
View File
@@ -52,8 +52,11 @@ namespace Artemis.UI.PropertyInput
protected override void OnInputValueApplied()
{
_layerService.RemoveLayerBrush(LayerProperty.Layer);
_layerService.InstantiateLayerBrush(LayerProperty.Layer);
if (LayerProperty.ProfileElement is Layer layer)
{
_layerService.RemoveLayerBrush(layer);
_layerService.InstantiateLayerBrush(layer);
}
}
private void SetBrushByDescriptor(LayerBrushDescriptor value)
src/Artemis.UI/PropertyInput/SKPointPropertyInputViewModel.cs
+11 -9
View File
@@ -1,4 +1,6 @@
using Artemis.Core.Models.Profile.LayerProperties;
using System;
using Artemis.Core.Extensions;
using Artemis.Core.Models.Profile.LayerProperties;
using Artemis.UI.Shared.PropertyInput;
using Artemis.UI.Shared.Services.Interfaces;
using FluentValidation;
@@ -42,18 +44,18 @@ namespace Artemis.UI.PropertyInput
public SKPointPropertyInputViewModelValidator()
{
RuleFor(vm => vm.X)
.LessThanOrEqualTo(vm => ((SKPoint) vm.LayerProperty.PropertyDescription.MaxInputValue).X)
.When(vm => vm.LayerProperty.PropertyDescription.MaxInputValue is SKPoint);
.LessThanOrEqualTo(vm => Convert.ToSingle(vm.LayerProperty.PropertyDescription.MaxInputValue))
.When(vm => vm.LayerProperty.PropertyDescription.MaxInputValue.IsNumber());
RuleFor(vm => vm.X)
.GreaterThanOrEqualTo(vm => ((SKPoint) vm.LayerProperty.PropertyDescription.MaxInputValue).X)
.When(vm => vm.LayerProperty.PropertyDescription.MaxInputValue is SKPoint);
.GreaterThanOrEqualTo(vm => Convert.ToSingle(vm.LayerProperty.PropertyDescription.MinInputValue))
.When(vm => vm.LayerProperty.PropertyDescription.MinInputValue.IsNumber());
RuleFor(vm => vm.Y)
.LessThanOrEqualTo(vm => ((SKPoint) vm.LayerProperty.PropertyDescription.MaxInputValue).Y)
.When(vm => vm.LayerProperty.PropertyDescription.MaxInputValue is SKPoint);
.LessThanOrEqualTo(vm => Convert.ToSingle(vm.LayerProperty.PropertyDescription.MaxInputValue))
.When(vm => vm.LayerProperty.PropertyDescription.MaxInputValue.IsNumber());
RuleFor(vm => vm.Y)
.GreaterThanOrEqualTo(vm => ((SKPoint) vm.LayerProperty.PropertyDescription.MaxInputValue).Y)
.When(vm => vm.LayerProperty.PropertyDescription.MaxInputValue is SKPoint);
.GreaterThanOrEqualTo(vm => Convert.ToSingle(vm.LayerProperty.PropertyDescription.MinInputValue))
.When(vm => vm.LayerProperty.PropertyDescription.MinInputValue.IsNumber());
}
}
}
src/Artemis.UI/PropertyInput/SKSizePropertyInputViewModel.cs
+11 -9
View File
@@ -1,4 +1,6 @@
using Artemis.Core.Models.Profile.LayerProperties;
using System;
using Artemis.Core.Extensions;
using Artemis.Core.Models.Profile.LayerProperties;
using Artemis.UI.Shared.PropertyInput;
using Artemis.UI.Shared.Services.Interfaces;
using FluentValidation;
@@ -42,18 +44,18 @@ namespace Artemis.UI.PropertyInput
public SKSizePropertyInputViewModelValidator()
{
RuleFor(vm => vm.Width)
.LessThanOrEqualTo(vm => ((SKSize) vm.LayerProperty.PropertyDescription.MaxInputValue).Width)
.When(vm => vm.LayerProperty.PropertyDescription.MaxInputValue is SKSize);
.LessThanOrEqualTo(vm => Convert.ToSingle(vm.LayerProperty.PropertyDescription.MaxInputValue))
.When(vm => vm.LayerProperty.PropertyDescription.MaxInputValue.IsNumber());
RuleFor(vm => vm.Width)
.GreaterThanOrEqualTo(vm => ((SKSize) vm.LayerProperty.PropertyDescription.MaxInputValue).Width)
.When(vm => vm.LayerProperty.PropertyDescription.MaxInputValue is SKSize);
.GreaterThanOrEqualTo(vm => Convert.ToSingle(vm.LayerProperty.PropertyDescription.MinInputValue))
.When(vm => vm.LayerProperty.PropertyDescription.MinInputValue.IsNumber());
RuleFor(vm => vm.Height)
.LessThanOrEqualTo(vm => ((SKSize) vm.LayerProperty.PropertyDescription.MaxInputValue).Height)
.When(vm => vm.LayerProperty.PropertyDescription.MaxInputValue is SKSize);
.LessThanOrEqualTo(vm => Convert.ToSingle(vm.LayerProperty.PropertyDescription.MaxInputValue))
.When(vm => vm.LayerProperty.PropertyDescription.MaxInputValue.IsNumber());
RuleFor(vm => vm.Height)
.GreaterThanOrEqualTo(vm => ((SKSize) vm.LayerProperty.PropertyDescription.MaxInputValue).Height)
.When(vm => vm.LayerProperty.PropertyDescription.MaxInputValue is SKSize);
.GreaterThanOrEqualTo(vm => Convert.ToSingle(vm.LayerProperty.PropertyDescription.MinInputValue))
.When(vm => vm.LayerProperty.PropertyDescription.MinInputValue.IsNumber());
}
}
}