Prechádzať zdrojové kódy

Fix to FIndDynamicGrid being too lenient.

Kenric Nugteren 2 rokov pred
rodič
commit
5aea90a3f0
1 zmenil súbory, kde vykonal 5 pridanie a 1 odobranie
  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;
                 _dynamicGrids[gridType] = grids;
             }
             }
             grids = grids.Where(x=>x.IsSubclassOfRawGeneric(gridType)).ToArray();
             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();
             var defaults = entityGrids.Where(x => x.IsAssignableTo(typeof(IDefaultGrid))).ToList();
             if(defaults.Count > 0)
             if(defaults.Count > 0)