Browse Source

Updated opacity bug

flabbet 4 years ago
parent
commit
6b38cfd0c8

+ 17 - 1
PixiEditor/Views/UserControls/LayersManager.xaml.cs

@@ -90,6 +90,10 @@ namespace PixiEditor.Views.UserControls
             {
                 numberInput.Value = layer.Opacity * 100f;
             }
+            else if(item is LayerStructureItemContainer container)
+            {
+                numberInput.Value = container.Layer.Opacity * 100f;
+            }
             else if (item is LayerGroup group)
             {
                 numberInput.Value = group.StructureData.Opacity * 100f;
@@ -158,8 +162,20 @@ namespace PixiEditor.Views.UserControls
 
             object item = SelectedItem;
 
-            if (item is Layer layer)
+            if (item is Layer || item is LayerStructureItemContainer)
             {
+
+                Layer layer = null;
+
+                if(item is Layer lr)
+                {
+                    layer = lr;
+                }
+                else if(item is LayerStructureItemContainer container)
+                {
+                    layer = container.Layer;
+                }
+
                 float oldOpacity = layer.Opacity;
 
                 var doc = LayerCommandsViewModel.Owner.BitmapManager.ActiveDocument;

+ 1 - 1
PixiEditorTests/PixiEditorTests.csproj

@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="OpenCover" Version="4.7.922" />
     <PackageReference Include="xunit" Version="2.4.1" />