Browse Source

Prevent alpha in palettes

flabbet 3 years ago
parent
commit
d1af0d43dd

+ 4 - 4
PixiEditor/PixiEditor.csproj

@@ -190,14 +190,14 @@
 		</None>
 		</None>
 	</ItemGroup>
 	</ItemGroup>
 	<ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Dirkster.AvalonDock" Version="4.60.1" />
+		<PackageReference Include="Dirkster.AvalonDock" Version="4.70.1" />
 		<PackageReference Include="ByteSize" Version="2.1.1" />
 		<PackageReference Include="ByteSize" Version="2.1.1" />
 		<PackageReference Include="DiscordRichPresence" Version="1.0.175" />
 		<PackageReference Include="DiscordRichPresence" Version="1.0.175" />
 		<PackageReference Include="Expression.Blend.Sdk">
 		<PackageReference Include="Expression.Blend.Sdk">
 			<Version>1.0.2</Version>
 			<Version>1.0.2</Version>
 			<NoWarn>NU1701</NoWarn>
 			<NoWarn>NU1701</NoWarn>
 		</PackageReference>
 		</PackageReference>
-		<PackageReference Include="Hardware.Info" Version="1.1.1.1" />
+		<PackageReference Include="Hardware.Info" Version="10.0.0" />
 		<PackageReference Include="MessagePack" Version="2.3.85" />
 		<PackageReference Include="MessagePack" Version="2.3.85" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
 		<PackageReference Include="MvvmLightLibs" Version="5.4.1.1">
 		<PackageReference Include="MvvmLightLibs" Version="5.4.1.1">
@@ -205,8 +205,8 @@
 		</PackageReference>
 		</PackageReference>
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 		<PackageReference Include="PixiEditor.ColorPicker" Version="3.3.1" />
 		<PackageReference Include="PixiEditor.ColorPicker" Version="3.3.1" />
-		<PackageReference Include="PixiEditor.Parser" Version="2.1.0" />
-		<PackageReference Include="PixiEditor.Parser.Skia" Version="2.0.0.1" />
+		<PackageReference Include="PixiEditor.Parser" Version="2.1.0.2" />
+		<PackageReference Include="PixiEditor.Parser.Skia" Version="2.1.0" />
 		<PackageReference Include="SkiaSharp" Version="2.80.3" />
 		<PackageReference Include="SkiaSharp" Version="2.80.3" />
 		<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
 		<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
 		<PackageReference Include="WpfAnimatedGif" Version="2.0.2" />
 		<PackageReference Include="WpfAnimatedGif" Version="2.0.2" />

+ 2 - 2
PixiEditor/Views/UserControls/Palettes/PaletteColorAdder.xaml.cs

@@ -88,7 +88,7 @@ namespace PixiEditor.Views.UserControls.Palettes
 
 
         private void UpdateAddButton()
         private void UpdateAddButton()
         {
         {
-            AddButton.IsEnabled = !Colors.Contains(ToSKColor(SelectedColor));
+            AddButton.IsEnabled = !Colors.Contains(ToSKColor(SelectedColor)) && SelectedColor.A == 255;
         }
         }
 
 
         private static void OnSwatchesChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         private static void OnSwatchesChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -126,7 +126,7 @@ namespace PixiEditor.Views.UserControls.Palettes
             SKColor color = ToSKColor(SelectedColor);
             SKColor color = ToSKColor(SelectedColor);
             if (!Colors.Contains(color))
             if (!Colors.Contains(color))
             {
             {
-                Colors.Add(color);
+                Colors.Add(color.WithAlpha(255));
                 AddButton.IsEnabled = false;
                 AddButton.IsEnabled = false;
             }
             }
         }
         }

+ 2 - 2
PixiEditorTests/PixiEditorTests.csproj

@@ -38,14 +38,14 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Moq" Version="4.16.1" />
+    <PackageReference Include="Moq" Version="4.17.2" />
     <PackageReference Include="OpenCover" Version="4.7.1221" />
     <PackageReference Include="OpenCover" Version="4.7.1221" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     </PackageReference>
-    <PackageReference Include="Xunit.StaFact" Version="1.0.37" />
+    <PackageReference Include="Xunit.StaFact" Version="1.1.11" />
   </ItemGroup>
   </ItemGroup>
 
 
   <ItemGroup>
   <ItemGroup>