[DYN-4361] Revert changed to WatchTree (#15720)

DynamoDS · Dec 12, 2024 · 7bcdb04 · 7bcdb04
1 parent 956959f
commit 7bcdb04
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 27 deletions.
diff --git a/src/DynamoCoreWpf/Views/Preview/WatchTree.xaml b/src/DynamoCoreWpf/Views/Preview/WatchTree.xaml
@@ -352,23 +352,19 @@
                             </TextBlock.Style>
                         </TextBlock>
 
-                        <TextBox Width="Auto"
-                                 Margin="{Binding Path=IsTopLevel, Converter={StaticResource TopLevelLabelMarginConverter}}"
-                                 VerticalAlignment="Center"
-                                 FontFamily="{StaticResource SourceCodePro}"
-                                 Text="{Binding Path=NodeLabel}"
-                                 Visibility="{Binding Path=NodeLabel, Converter={StaticResource EmptyStringToCollapsedConverter}}"
-                                 IsReadOnly="True"
-                                 Background="Transparent"
-                                 BorderThickness="0"
-                                 TextWrapping="Wrap">
+                        <TextBlock Width="Auto"
+                                   Margin="{Binding Path=IsTopLevel, Converter={StaticResource TopLevelLabelMarginConverter}}"
+                                   VerticalAlignment="Center"                                                                      
+                                   FontFamily="{StaticResource SourceCodePro}"
+                                   Text="{Binding Path=NodeLabel}"
+                                   Visibility="{Binding Path=NodeLabel, Converter={StaticResource EmptyStringToCollapsedConverter}}" >
                             <TextBlock.Foreground>
                                 <MultiBinding Converter="{StaticResource ObjectTypeConverter}">
                                     <Binding Path="ValueType" />
                                     <Binding Path="NodeLabel" />
                                 </MultiBinding>
                             </TextBlock.Foreground>
-                        </TextBox>
+                        </TextBlock>
 
                         <Button Margin="10,2,2,2"
                                 Padding="4,0,4,0"

diff --git a/test/DynamoCoreWpfTests/NodeViewCustomizationTests.cs b/test/DynamoCoreWpfTests/NodeViewCustomizationTests.cs
@@ -292,12 +292,8 @@ public void WatchContainsExpectedUiElements()
             var tree = nodeView.ChildrenOfType<WatchTree>();
             Assert.AreEqual(1, tree.Count());
 
-            // text block for list indexes
-            var textBlocks = tree.First().treeView1.ChildrenOfType<TextBlock>();
-            Assert.AreEqual(4, textBlocks.Count());
-            // text boxes for list items
-            var textBoxes = tree.First().treeView1.ChildrenOfType<TextBox>();
-            Assert.AreEqual(4, textBoxes.Count());
+            var items = tree.First().treeView1.ChildrenOfType<TextBlock>();
+            Assert.AreEqual(8, items.Count());
         }
 
         [Test, Category("DisplayHardwareDependent")]
@@ -441,12 +437,7 @@ public void WatchConnectDisconnectTest()
 
             var items = tree.First().treeView1.ChildrenOfType<TextBlock>();
             // watch is computed with cbn and has its value
-            // text block for list indexes
-            var textBlocks = tree.First().treeView1.ChildrenOfType<TextBlock>();
-            Assert.AreEqual(4, textBlocks.Count());
-            // text boxes for list items
-            var textBoxes = tree.First().treeView1.ChildrenOfType<TextBox>();
-            Assert.AreEqual(4, textBoxes.Count());
+            Assert.AreEqual(8, items.Count());
 
             // disconnect watch
             Model.ExecuteCommand(new DynamoModel.MakeConnectionCommand(watchGuid, 0, PortType.Input,
@@ -473,10 +464,8 @@ public void WatchConnectDisconnectTest()
             Run();
             DispatcherUtil.DoEvents();
             tree = nodeView.ChildrenOfType<WatchTree>();
-            textBlocks = tree.First().treeView1.ChildrenOfType<TextBlock>();
-            Assert.AreEqual(4, textBlocks.Count());
-            textBoxes = tree.First().treeView1.ChildrenOfType<TextBox>();
-            Assert.AreEqual(4, textBoxes.Count());
+            items = tree.First().treeView1.ChildrenOfType<TextBlock>();
+            Assert.AreEqual(8, items.Count());
         }
 
         [Test]