mirror of
https://github.com/Artemis-RGB/Artemis
synced 2026-01-02 10:43:31 +00:00
Compare commits
No commits in common. "28640f950284d5ceaac292f398cd0c1265541b69" and "a113497941496ded9499a3c4d5ddb15501b8fb31" have entirely different histories.
28640f9502
...
a113497941
2
.github/workflows/docfx.yml
vendored
2
.github/workflows/docfx.yml
vendored
@ -26,7 +26,7 @@ jobs:
|
|||||||
- name: Build DocFX
|
- name: Build DocFX
|
||||||
run: docfx docfx/docfx_project/docfx.json
|
run: docfx docfx/docfx_project/docfx.json
|
||||||
- name: Upload to FTP
|
- name: Upload to FTP
|
||||||
uses: SamKirkland/FTP-Deploy-Action@v4.3.5
|
uses: SamKirkland/FTP-Deploy-Action@4.3.4
|
||||||
with:
|
with:
|
||||||
server: www360.your-server.de
|
server: www360.your-server.de
|
||||||
protocol: ftps
|
protocol: ftps
|
||||||
|
|||||||
@ -61,9 +61,6 @@ 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();
|
||||||
|
|||||||
@ -160,12 +160,10 @@ public sealed class Layer : RenderProfileElement
|
|||||||
public LayerAdapter Adapter { get; }
|
public LayerAdapter Adapter { get; }
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public override bool ShouldBeEnabled => !Suspended && DisplayConditionMet && HasBounds;
|
public override bool ShouldBeEnabled => !Suspended && DisplayConditionMet;
|
||||||
|
|
||||||
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()
|
||||||
{
|
{
|
||||||
@ -385,7 +383,7 @@ public sealed class Layer : RenderProfileElement
|
|||||||
|
|
||||||
if (ShouldBeEnabled)
|
if (ShouldBeEnabled)
|
||||||
Enable();
|
Enable();
|
||||||
else if (Suspended || !HasBounds || (Timeline.IsFinished && !_renderCopies.Any()))
|
else if (Suspended || (Timeline.IsFinished && !_renderCopies.Any()))
|
||||||
Disable();
|
Disable();
|
||||||
|
|
||||||
if (!Enabled || Timeline.Delta == TimeSpan.Zero)
|
if (!Enabled || Timeline.Delta == TimeSpan.Zero)
|
||||||
|
|||||||
@ -1,5 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
namespace Artemis.Core;
|
namespace Artemis.Core;
|
||||||
|
|
||||||
@ -15,13 +14,12 @@ 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 = Random.Shared;
|
_rand = new Random();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@ -1,5 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
namespace Artemis.Core;
|
namespace Artemis.Core;
|
||||||
|
|
||||||
@ -15,13 +14,12 @@ 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 = Random.Shared;
|
_rand = new Random();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@ -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(Random.Shared.Next(0, icons.Count - 1));
|
: icons.ElementAt(new Random().Next(0, icons.Count - 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task SaveIcon()
|
private async Task SaveIcon()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user