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 2022-11-01 21:21:37 +01:00
commit d5518b8edf
8 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,8 @@ public sealed class Layer : RenderProfileElement
/// <param name="profile">The profile the layer belongs to</param>
/// <param name="parent">The parent of the layer</param>
/// <param name="layerEntity">The entity of the layer</param>
public Layer(Profile profile, ProfileElement parent, LayerEntity layerEntity) : base(parent, parent.Profile)
/// <param name="loadNodeScript">A boolean indicating whether or not to attempt to load the node script straight away</param>
public Layer(Profile profile, ProfileElement parent, LayerEntity layerEntity, bool loadNodeScript = false) : base(parent, parent.Profile)
{
LayerEntity = layerEntity;
EntityId = layerEntity.Id;
@ -62,6 +63,8 @@ public sealed class Layer : RenderProfileElement
Load();
Initialize();
if (loadNodeScript)
LoadNodeScript();
}
/// <summary>

3
src/Artemis.UI.Linux/Artemis.UI.Linux.csproj
View File

@ -8,7 +8,8 @@
<OutputPath>bin</OutputPath>
<AssemblyTitle>Artemis</AssemblyTitle>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
<AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
</PropertyGroup>
<ItemGroup>
<AvaloniaResource Include="Assets\**" />

1
src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj
View File

@ -8,6 +8,7 @@
<OutputPath>bin</OutputPath>
<AssemblyTitle>Artemis</AssemblyTitle>
<AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
</PropertyGroup>
<ItemGroup>
<AvaloniaResource Include="Assets\**" />

17
src/Artemis.UI.Shared/Controls/GradientPicker/GradientPicker.cs
View File

@ -87,12 +87,12 @@ public class GradientPicker : TemplatedControl
if (ColorGradient.Count <= 2)
return;
int index = ColorGradient.IndexOf(s);
ColorGradient.Remove(s);
if (index > ColorGradient.Count - 1)
int index = EditingColorGradient.IndexOf(s);
EditingColorGradient.Remove(s);
if (index > EditingColorGradient.Count - 1)
index--;
SelectedColorStop = ColorGradient.ElementAtOrDefault(index);
SelectedColorStop = EditingColorGradient.ElementAtOrDefault(index);
});
}
@ -309,13 +309,8 @@ public class GradientPicker : TemplatedControl
if (e.Key != Key.Delete || SelectedColorStop == null || EditingColorGradient.Count <= 2)
return;
int index = EditingColorGradient.IndexOf(SelectedColorStop);
EditingColorGradient.Remove(SelectedColorStop);
if (index > EditingColorGradient.Count - 1)
index--;
SelectedColorStop = EditingColorGradient.ElementAtOrDefault(index);
DeleteStop.Execute(SelectedColorStop);
e.Handled = true;
}

1
src/Artemis.UI.Windows/Artemis.UI.Windows.csproj
View File

@ -8,6 +8,7 @@
<AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
<AssemblyTitle>Artemis</AssemblyTitle>
<ApplicationIcon>..\Artemis.UI\Assets\Images\Logo\application.ico</ApplicationIcon>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
</PropertyGroup>
<ItemGroup>
<AvaloniaResource Include="Assets\**" />

2
src/Artemis.UI/Extensions/ProfileElementExtensions.cs
View File

@ -55,7 +55,7 @@ public static class ProfileElementExtensions
return folderClipboardModel.Paste(parent.Profile, parent);
case LayerEntity layerEntity:
layerEntity.Id = Guid.NewGuid();
return new Layer(parent.Profile, parent, layerEntity);
return new Layer(parent.Profile, parent, layerEntity, true);
default:
return null;
}

2
src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/LayerTreeItemViewModel.cs
View File

@ -41,7 +41,7 @@ public class LayerTreeItemViewModel : TreeItemViewModel
copy.Id = Guid.NewGuid();
copy.Name = Layer.Parent.GetNewFolderName(copy.Name + " - copy");
Layer copied = new(Layer.Profile, Layer.Parent, copy);
Layer copied = new(Layer.Profile, Layer.Parent, copy, true);
ProfileEditorService.ExecuteCommand(new AddProfileElement(copied, Layer.Parent, Layer.Order - 1));
Layer.Profile.PopulateLeds(_rgbService.EnabledDevices);
}

2
src/Artemis.UI/Screens/Scripting/ScriptsDialogViewModel.cs
View File

@ -64,7 +64,7 @@ public class ScriptsDialogViewModel : DialogViewModelBase<object?>
.Subscribe()
.DisposeWith(d);
_scriptConfigurations = scriptConfigurationViewModels;
ScriptConfigurations = scriptConfigurationViewModels;
SelectedScript = ScriptConfigurations.FirstOrDefault();
Disposable.Create(() => profileService.SaveProfile(Profile, false)).DisposeWith(d);
});