Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit 463ee02

Browse files
Merge pull request #63 from jogibear9988/master
Fix Unit Tests -> ListBox is a ItemsControl and can now get Content!
2 parents 2f2d22f + a6b6e44 commit 463ee02

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Designer/EditOperationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void Copy()
7070

7171
private DesignItem IntializePasteOperationsTest()
7272
{
73-
var grid = CreateGridContextWithDesignSurface("<Button Name=\"TestElement\"/><Grid><Button/></Grid><Window/><ListBox/>");
73+
var grid = CreateGridContextWithDesignSurface("<Button Name=\"TestElement\"/><Grid><Button/></Grid><Window/><Image/>");
7474
Assert.IsNotNull(grid);
7575
var xamlConxtext = grid.Context as XamlDesignContext;
7676
if (xamlConxtext != null) {

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/NameScopeHelper.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ public static void NameChanged(XamlObject namedObject, string oldName, string ne
3838
}
3939
if (newName != null) {
4040
nameScope.RegisterName(newName, namedObject.Instance);
41+
42+
try{
43+
var prp = namedObject.ElementType.GetProperty(namedObject.RuntimeNameProperty);
44+
if (prp != null)
45+
prp.SetValue(namedObject.Instance, newName, null);
46+
} catch (Exception x) {
47+
Debug.WriteLine(x.Message);
48+
}
4149
}
4250
break;
4351
}

0 commit comments

Comments
 (0)