浏览代码

Fix to FIndDynamicGrid being too lenient.

Kenric Nugteren 2 年之前
父节点
当前提交
5aea90a3f0
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      inabox.wpf/DynamicGrid/DynamicGridUtils.cs

+ 5 - 1
inabox.wpf/DynamicGrid/DynamicGridUtils.cs

@@ -450,7 +450,11 @@ namespace InABox.DynamicGrid
                 _dynamicGrids[gridType] = grids;
             }
             grids = grids.Where(x=>x.IsSubclassOfRawGeneric(gridType)).ToArray();
-            var entityGrids = grids.Where(x => x.ContainsInheritedGenericType(entityType)).ToList();
+            var entityGrids = grids.Where(x =>
+            {
+                var baseGrid = x.GetSuperclassDefinition(typeof(BaseDynamicGrid<>));
+                return baseGrid?.GenericTypeArguments[0] == entityType;
+            }).ToList();
 
             var defaults = entityGrids.Where(x => x.IsAssignableTo(typeof(IDefaultGrid))).ToList();
             if(defaults.Count > 0)