Browse Source

Fixed changing width with []

flabbet 8 months ago
parent
commit
d6ca000949

+ 5 - 5
src/PixiEditor/ViewModels/Document/DocumentViewModel.Serialization.cs

@@ -91,14 +91,14 @@ internal partial class DocumentViewModel
         VecD resizeFactor = new VecD(resizeFactorX, resizeFactorY);
 
         AddElements(NodeGraph.StructureTree.Members.Where(x => x.IsVisibleBindable).Reverse().ToList(), svgDocument,
-            atTime, resizeFactor, vectorExportConfig, exportSize);
+            atTime, resizeFactor, vectorExportConfig);
 
         return svgDocument;
     }
 
     private void AddElements(IEnumerable<IStructureMemberHandler> root, IElementContainer elementContainer,
         KeyFrameTime atTime,
-        VecD resizeFactor, VectorExportConfig? vectorExportConfig, VecI exportSize)
+        VecD resizeFactor, VectorExportConfig? vectorExportConfig)
     {
         foreach (var member in root)
         {
@@ -107,7 +107,7 @@ internal partial class DocumentViewModel
                 var group = new SvgGroup();
 
                 AddElements(folderNodeViewModel.Children.Where(x => x.IsVisibleBindable).Reverse().ToList(), group,
-                    atTime, resizeFactor, vectorExportConfig, exportSize);
+                    atTime, resizeFactor, vectorExportConfig);
                 elementContainer.Children.Add(group);
             }
 
@@ -118,13 +118,13 @@ internal partial class DocumentViewModel
             }
             else if (member is IVectorLayerHandler vectorLayerHandler)
             {
-                AddSvgShape(elementContainer, vectorLayerHandler, resizeFactor, exportSize);
+                AddSvgShape(elementContainer, vectorLayerHandler, resizeFactor);
             }
         }
     }
 
     private void AddSvgShape(IElementContainer elementContainer, IVectorLayerHandler vectorLayerHandler,
-        VecD resizeFactor, VecI exportSize)
+        VecD resizeFactor)
     {
         IReadOnlyVectorNode vectorNode =
             (IReadOnlyVectorNode)Internals.Tracker.Document.FindNode(vectorLayerHandler.Id);

+ 1 - 1
src/PixiEditor/ViewModels/SubViewModels/ToolsViewModel.cs

@@ -312,7 +312,7 @@ internal class ToolsViewModel : SubViewModel<ViewModelMain>, IToolsHandler
     }
 
     [Evaluator.CanExecute("PixiEditor.Tools.CanChangeToolSize")]
-    public bool CanChangeToolSize() => Owner.ToolsSubViewModel.ActiveTool?.Toolbar is PenToolbar
+    public bool CanChangeToolSize() => Owner.ToolsSubViewModel.ActiveTool?.Toolbar is IToolSizeToolbar
                                        && Owner.ToolsSubViewModel.ActiveTool is not PenToolViewModel
                                        {
                                            PixelPerfectEnabled: true

+ 2 - 2
src/PixiEditor/ViewModels/Tools/ToolSettings/Toolbars/ShapeToolbar.cs

@@ -53,13 +53,13 @@ internal class ShapeToolbar : Toolbar, IShapeToolbar
 
     public ShapeToolbar()
     {
-        AddSetting(new SizeSettingViewModel(nameof(ToolSize), "STROKE_THICKNESS_LABEL", 0, decimalPlaces: 2));
-        AddSetting(new ColorSettingViewModel(nameof(StrokeColor), "STROKE_COLOR_LABEL"));
+        AddSetting(new SizeSettingViewModel(nameof(ToolSize), "STROKE_WIDTH", 0, decimalPlaces: 2));
         AddSetting(new BoolSettingViewModel(nameof(AntiAliasing), "ANTI_ALIASING_LABEL")
         {
             IsExposed = false, Value = false
         });
         AddSetting(
             new BoolSettingViewModel(nameof(SyncWithPrimaryColor), "SYNC_WITH_PRIMARY_COLOR_LABEL") { Value = true });
+        AddSetting(new ColorSettingViewModel(nameof(StrokeColor), "STROKE_COLOR_LABEL"));
     }
 }