Merge pull request #41 from giard-alexandre/fix/modal-inherit-theme

giard-alexandre · web-flow · commit 13d6b1418377 · 2024-10-14T16:35:57.000-05:00
fix: pass theme to modal
diff --git a/src/DynamicTreeDataGrid/DynamicTreeDataGrid.cs b/src/DynamicTreeDataGrid/DynamicTreeDataGrid.cs
@@ -22,6 +22,9 @@ public class DynamicTreeDataGrid : TreeDataGrid {
     public void ShowColumnEditor() {
         var columnsWindow = new ColumnEditorWindow { DataContext = Source?.Columns };
         var topLevel = TopLevel.GetTopLevel(this);
-        if (topLevel is Window window) columnsWindow.ShowDialog(window);
+        if (topLevel is not Window window) return;
+
+        columnsWindow.RequestedThemeVariant = topLevel.RequestedThemeVariant;
+        columnsWindow.ShowDialog(window);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@ public class DynamicTreeDataGrid : TreeDataGrid {`
`22`	`22`	`public void ShowColumnEditor() {`
`23`	`23`	`var columnsWindow = new ColumnEditorWindow { DataContext = Source?.Columns };`
`24`	`24`	`var topLevel = TopLevel.GetTopLevel(this);`
`25`		`- if (topLevel is Window window) columnsWindow.ShowDialog(window);`
	`25`	`+ if (topLevel is not Window window) return;`
	`26`	`+`
	`27`	`+ columnsWindow.RequestedThemeVariant = topLevel.RequestedThemeVariant;`
	`28`	`+ columnsWindow.ShowDialog(window);`
`26`	`29`	`}`
`27`	`30`	`}`