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

Color brush - Fixed gradient picker not appearing

Browse Source 
Gradient picker - Use dialog instead of a popup window
This commit is contained in:
SpoinkyNL committed 2020-04-17 23:01:42 +02:00
1 parent e863652b08
commit 45baa6ab85
21 files changed
+206 -101
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Plugins/Artemis.Plugins.Devices.DMX/Artemis.Plugins.Devices.DMX.csproj
+1 -1
View File
@@ -24,7 +24,7 @@
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="MaterialDesignThemes" Version="3.0.1" />
<PackageReference Include="MaterialDesignThemes" Version="3.1.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Artemis.Core\Artemis.Core.csproj">
src/Plugins/Artemis.Plugins.Devices.WS281X/Artemis.Plugins.Devices.WS281X.csproj
+1 -1
View File
@@ -24,7 +24,7 @@
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="MaterialDesignThemes" Version="3.0.1" />
<PackageReference Include="MaterialDesignThemes" Version="3.1.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Artemis.Core\Artemis.Core.csproj">
src/Plugins/Artemis.Plugins.LayerBrushes.Color/ColorBrush.cs
+2 -2
View File
@@ -28,9 +28,9 @@ namespace Artemis.Plugins.LayerBrushes.Color
private void UpdateColorProperties()
{
Layer.Properties.RemoveLayerProperty(ColorProperty);
UnRegisterLayerProperty(ColorProperty);
ColorProperty = null;
Layer.Properties.RemoveLayerProperty(GradientProperty);
UnRegisterLayerProperty(GradientProperty);
GradientProperty = null;
if (GradientTypeProperty.Value == GradientType.Solid)
src/Plugins/Artemis.Plugins.LayerBrushes.Noise/NoiseBrush.cs
+4 -2
View File
@@ -180,9 +180,11 @@ namespace Artemis.Plugins.LayerBrushes.Noise
private void CreateColorMap(object sender, EventArgs e)
{
_colorMap = new SKColor[101];
var colorMap = new SKColor[101];
for (var i = 0; i < 101; i++)
_colorMap[i] = GradientColorProperty.Value.GetColor(i / 100f);
colorMap[i] = GradientColorProperty.Value.GetColor(i / 100f);
_colorMap = colorMap;
}
}