Kaynağa Gözat

Fixed shared toolbar cast exception

flabbet 8 ay önce
ebeveyn
işleme
a6f447d542

+ 0 - 5
src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/MergeNode.cs

@@ -56,11 +56,6 @@ public class MergeNode : RenderNode
             int saved = target.Canvas.SaveLayer();
             Bottom.Value.Paint(context, target);
 
-            if (paint == null)
-            {
-                paint = new Paint();
-            }
-            
             paint.BlendMode = RenderContext.GetDrawingBlendMode(BlendMode.Value);
             target.Canvas.SaveLayer(paint);
             

+ 14 - 2
src/PixiEditor/ViewModels/Tools/Tools/PenToolViewModel.cs

@@ -76,8 +76,20 @@ namespace PixiEditor.ViewModels.Tools.Tools
                 return;
             }
             
-            var oldSetting = (SizeSettingViewModel)oldToolbar.Settings[0];
-            actualToolSize = (int)oldSetting.Value;
+            var oldSetting = oldToolbar.Settings.FirstOrDefault(x => x.Name == nameof(oldToolbar.ToolSize));
+            if (oldSetting is null)
+            {
+                return;
+            }
+            
+            if(oldSetting.Value is int intValue)
+            {
+                actualToolSize = intValue;
+            }
+            else if(oldSetting.Value is double doubleValue)
+            {
+                actualToolSize = (int)doubleValue;
+            }
         }
 
         public override void OnDeselecting(bool transient)