Pārlūkot izejas kodu

Fixes to build errors

Kenric Nugteren 7 mēneši atpakaļ
vecāks
revīzija
d505a53936

+ 2 - 2
inabox.wpf/DigitalForms/DigitalFormGrid.cs

@@ -413,10 +413,10 @@ namespace InABox.DynamicGrid
             }
         }
 
-        public override bool EditItems(DigitalForm[] items, Func<Type, CoreTable?>? PageDataHandler = null, bool PreloadPages = false)
+        public override bool EditItems(DigitalForm[] items, Func<Type, CoreTable?>? PageDataHandler = null, bool PreloadPages = false, DependencyObject? parent = null)
         {
             // Need to do this to make sure that the variables are available to the layouts (and vice versa?)
-            return base.EditItems(items, PageDataHandler, true);
+            return base.EditItems(items, PageDataHandler, true, parent);
         }
 
         private const string ExportFileFilter = "Excel Files (*.xls, *xlsx)|*.xls;*.xlsx|Digital Forms (*.prs-form)|*.prs-form";

+ 3 - 2
inabox.wpf/DynamicGrid/DynamicImportGrid.cs

@@ -279,7 +279,7 @@ namespace InABox.DynamicGrid
             return result;
         }
 
-        public override bool EditItems(Importer[] items, Func<Type, CoreTable?>? PageDataHandler = null, bool PreloadPages = false)
+        public override bool EditItems(Importer[] items, Func<Type, CoreTable?>? PageDataHandler = null, bool PreloadPages = false, DependencyObject? parent = null)
         {
             if (items.Length != 1)
             {
@@ -287,7 +287,8 @@ namespace InABox.DynamicGrid
                 return false;
             }
 
-            var form = new DynamicImportForm(items[0]);
+            var owner = Window.GetWindow(parent ?? this);
+            var form = new DynamicImportForm(items[0]) { Owner = owner };
             if (form.ShowDialog() == true)
             {
                 SaveItem(items[0]);