Browse Source

Removed the Untitled from Frames, renamed the start and end modify nodes and adjusted bound position for zones

CPKreuz 1 year ago
parent
commit
abf966be8e

+ 0 - 1
src/PixiEditor.AvaloniaUI/Styles/Templates/NodeFrameView.axaml

@@ -13,7 +13,6 @@
                                    StrokeThickness="2" RadiusX="10" RadiusY="10"
                                    Width="{Binding Size.X, RelativeSource={RelativeSource FindAncestor, AncestorType=nodes:NodeFrameView}}"
                                    Height="{Binding Size.Y, RelativeSource={RelativeSource FindAncestor, AncestorType=nodes:NodeFrameView}}" />
-                        <TextBlock Margin="10,10,0,0" Foreground="#C0FFFFFF" Text="Untitled..." FontStyle="Italic" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>

+ 2 - 0
src/PixiEditor.AvaloniaUI/ViewModels/Nodes/NodeFrameViewModel.cs

@@ -16,6 +16,8 @@ internal sealed class NodeFrameViewModel : NodeFrameViewModelBase
 
     protected override void CalculateBounds()
     {
+        
+        // TODO: Use the GetBounds like in NodeZoneViewModel
         if (Nodes.Count == 0)
         {
             if (TopLeft == BottomRight)

+ 2 - 1
src/PixiEditor.AvaloniaUI/ViewModels/Nodes/NodeZoneViewModel.cs

@@ -51,11 +51,12 @@ public sealed class NodeZoneViewModel : NodeFrameViewModelBase
         const int defaultXOffset = -30;
         const int defaultYOffset = -45;
         
+        // TODO: Use the actual node height
         foreach (var node in Nodes)
         {
             if (node == start)
             {
-                list.Add(new RectD(node.PositionBindable + new VecD(50, defaultYOffset), new VecD(100, 400)));
+                list.Add(new RectD(node.PositionBindable + new VecD(100, defaultYOffset), new VecD(100, 400)));
                 continue;
             }
 

+ 2 - 2
src/PixiEditor.ChangeableDocument/Changes/NodeGraph/CreateModifyImageNodePair_Change.cs

@@ -36,8 +36,8 @@ internal class CreateModifyImageNodePair_Change : Change
 
         return new List<IChangeInfo>
         {
-            CreateNode_ChangeInfo.CreateFromNode(start, "Modify Image"),
-            CreateNode_ChangeInfo.CreateFromNode(end, "Modify Image"),
+            CreateNode_ChangeInfo.CreateFromNode(start, "Modify Image Start"),
+            CreateNode_ChangeInfo.CreateFromNode(end, "Modify Image End"),
             new CreateNodeZone_ChangeInfo(zoneId, "PixiEditor.ModifyImageZone", startId, endId)
         };
     }