浏览代码

Fix to the default values of DF controls

Kenric Nugteren 2 年之前
父节点
当前提交
4d11f48997

+ 2 - 2
InABox.Core/DigitalForms/Layouts/Controls/DFLayoutControl.cs

@@ -55,10 +55,10 @@ namespace InABox.Core
 
         protected override void LoadProperties()
         {
-            Row = GetProperty("Row", 0);
+            Row = GetProperty("Row", 1);
             RowSpan = GetProperty("RowSpan", 1);
             VerticalAlignment = GetProperty("VerticalAlignment", DFLayoutAlignment.Middle);
-            Column = GetProperty("Column", 0);
+            Column = GetProperty("Column", 1);
             ColumnSpan = GetProperty("ColumnSpan", 1);
             HorizontalAlignment = GetProperty("HorizontalAlignment", DFLayoutAlignment.Middle);
             Sequence = GetProperty("Sequence", DateTime.Now.Ticks);

+ 5 - 1
inabox.wpf/DynamicGrid/Editors/DynamicEditorControlFactory.cs

@@ -29,7 +29,11 @@ namespace InABox.DynamicGrid
             if(_editors is null)
             {
                 _editors = new();
-                foreach(var type in CoreUtils.TypeList(x => x.IsSubclassOfRawGeneric(typeof(BaseDynamicEditorControl<>))))
+                foreach(var type in CoreUtils.TypeList(AppDomain.CurrentDomain.GetAssemblies(),
+                    x => x.IsClass
+                        && !x.IsAbstract
+                        && !x.IsGenericType
+                        && x.IsSubclassOfRawGeneric(typeof(BaseDynamicEditorControl<>))))
                 {
                     var baseClass = type.GetSuperclassDefinition(typeof(BaseDynamicEditorControl<>))!;
                     var editor = baseClass.GenericTypeArguments[0];