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

Profiles - Avoid unnecessary OnBrokenStateChanged calls

Browse Source 
Profiles - Fixed int range/float range deserialization
Profiles - Use Random.Shared where applicable
This commit is contained in:
RobertBeekman 2024-03-02 17:38:20 +01:00
parent 5c7497a859
commit 28640f9502
5 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Artemis.Core/Models/BreakableModel.cs
View File

@ -61,6 +61,9 @@ public abstract class BreakableModel : CorePropertyChanged, IBreakableModel
/// <inheritdoc /> /// <inheritdoc />
public void SetBrokenState(string state, Exception? exception = null) public void SetBrokenState(string state, Exception? exception = null)
{ {
if (state == BrokenState && BrokenStateException?.StackTrace == exception?.StackTrace)
return;
BrokenState = state ?? throw new ArgumentNullException(nameof(state)); BrokenState = state ?? throw new ArgumentNullException(nameof(state));
BrokenStateException = exception; BrokenStateException = exception;
OnBrokenStateChanged(); OnBrokenStateChanged();

6
src/Artemis.Core/Models/Profile/Layer.cs
View File

@ -160,10 +160,12 @@ public sealed class Layer : RenderProfileElement
public LayerAdapter Adapter { get; } public LayerAdapter Adapter { get; }
/// <inheritdoc /> /// <inheritdoc />
public override bool ShouldBeEnabled => !Suspended && DisplayConditionMet; public override bool ShouldBeEnabled => !Suspended && DisplayConditionMet && HasBounds;
internal override RenderElementEntity RenderElementEntity => LayerEntity; internal override RenderElementEntity RenderElementEntity => LayerEntity;
private bool HasBounds => Bounds.Width > 0 && Bounds.Height > 0;
/// <inheritdoc /> /// <inheritdoc />
public override List<ILayerProperty> GetAllLayerProperties() public override List<ILayerProperty> GetAllLayerProperties()
{ {
@ -383,7 +385,7 @@ public sealed class Layer : RenderProfileElement
if (ShouldBeEnabled) if (ShouldBeEnabled)
Enable(); Enable();
else if (Suspended || (Timeline.IsFinished && !_renderCopies.Any())) else if (Suspended || !HasBounds || (Timeline.IsFinished && !_renderCopies.Any()))
Disable(); Disable();
if (!Enabled || Timeline.Delta == TimeSpan.Zero) if (!Enabled || Timeline.Delta == TimeSpan.Zero)

4
src/Artemis.Core/Models/Profile/LayerProperties/FloatRange.cs
View File

@ -1,4 +1,5 @@
using System; using System;
using System.Text.Json.Serialization;
namespace Artemis.Core; namespace Artemis.Core;
@ -14,12 +15,13 @@ public readonly struct FloatRange
/// </summary> /// </summary>
/// <param name="start">The start value of the range</param> /// <param name="start">The start value of the range</param>
/// <param name="end">The end value of the range</param> /// <param name="end">The end value of the range</param>
[JsonConstructor]
public FloatRange(float start, float end) public FloatRange(float start, float end)
{ {
Start = start; Start = start;
End = end; End = end;
_rand = new Random(); _rand = Random.Shared;
} }
/// <summary> /// <summary>

4
src/Artemis.Core/Models/Profile/LayerProperties/IntRange.cs
View File

@ -1,4 +1,5 @@
using System; using System;
using System.Text.Json.Serialization;
namespace Artemis.Core; namespace Artemis.Core;
@ -14,12 +15,13 @@ public readonly struct IntRange
/// </summary> /// </summary>
/// <param name="start">The start value of the range</param> /// <param name="start">The start value of the range</param>
/// <param name="end">The end value of the range</param> /// <param name="end">The end value of the range</param>
[JsonConstructor]
public IntRange(int start, int end) public IntRange(int start, int end)
{ {
Start = start; Start = start;
End = end; End = end;
_rand = new Random(); _rand = Random.Shared;
} }
/// <summary> /// <summary>

2
src/Artemis.UI/Screens/Sidebar/Dialogs/ProfileConfigurationEditViewModel.cs
View File

@ -162,7 +162,7 @@ public partial class ProfileConfigurationEditViewModel : DialogViewModelBase<Pro
// Preselect the icon or fall back to a random one // Preselect the icon or fall back to a random one
SelectedMaterialIcon = !IsNew && Enum.TryParse(_profileConfiguration.Icon.IconName, out MaterialIconKind enumValue) SelectedMaterialIcon = !IsNew && Enum.TryParse(_profileConfiguration.Icon.IconName, out MaterialIconKind enumValue)
? icons.FirstOrDefault(m => m.Icon == enumValue) ? icons.FirstOrDefault(m => m.Icon == enumValue)
: icons.ElementAt(new Random().Next(0, icons.Count - 1)); : icons.ElementAt(Random.Shared.Next(0, icons.Count - 1));
} }
private async Task SaveIcon() private async Task SaveIcon()