Patch TabPageModel and ToolPaneModel for cross-platform compatibility

lextm · lextm · commit 5fe9c74333a2 · 2025-12-20T00:56:47.000-05:00
diff --git a/ILSpy/ViewModels/TabPageModel.cs b/ILSpy/ViewModels/TabPageModel.cs
@@ -31,8 +31,14 @@ namespace ICSharpCode.ILSpy.ViewModels
 {
 	[Export]
 	[NonShared]
+#if CROSS_PLATFORM
+	public class TabPageModel : Dock.Model.TomsToolbox.Controls.Document
+	{
+		protected static DockWorkspace DockWorkspace => App.ExportProvider.GetExportedValue<DockWorkspace>();
+#else
 	public class TabPageModel : PaneModel
 	{
+#endif
 		public IExportProvider ExportProvider { get; }
 
 		public TabPageModel(IExportProvider exportProvider)
diff --git a/ILSpy/ViewModels/ToolPaneModel.cs b/ILSpy/ViewModels/ToolPaneModel.cs
@@ -20,8 +20,14 @@
 
 namespace ICSharpCode.ILSpy.ViewModels
 {
-	public abstract class ToolPaneModel : PaneModel
+#if CROSS_PLATFORM
+	public abstract class ToolPaneModel : Dock.Model.TomsToolbox.Controls.Tool
 	{
+		protected static DockWorkspace DockWorkspace => App.ExportProvider.GetExportedValue<DockWorkspace>();
+#else
+	public abstract class ToolPaneModel : ToolPaneModel
+	{
+#endif
 		public virtual void Show()
 		{
 			this.IsActive = true;

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,14 @@ namespace ICSharpCode.ILSpy.ViewModels`
`31`	`31`	`{`
`32`	`32`	`[Export]`
`33`	`33`	`[NonShared]`
	`34`	`+#if CROSS_PLATFORM`
	`35`	`+ public class TabPageModel : Dock.Model.TomsToolbox.Controls.Document`
	`36`	`+ {`
	`37`	`+ protected static DockWorkspace DockWorkspace => App.ExportProvider.GetExportedValue<DockWorkspace>();`
	`38`	`+#else`
`34`	`39`	`public class TabPageModel : PaneModel`
`35`	`40`	`{`
	`41`	`+#endif`
`36`	`42`	`public IExportProvider ExportProvider { get; }`
`37`	`43`
`38`	`44`	`public TabPageModel(IExportProvider exportProvider)`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,14 @@`
`20`	`20`
`21`	`21`	`namespace ICSharpCode.ILSpy.ViewModels`
`22`	`22`	`{`
`23`		`- public abstract class ToolPaneModel : PaneModel`
	`23`	`+#if CROSS_PLATFORM`
	`24`	`+ public abstract class ToolPaneModel : Dock.Model.TomsToolbox.Controls.Tool`
`24`	`25`	`{`
	`26`	`+ protected static DockWorkspace DockWorkspace => App.ExportProvider.GetExportedValue<DockWorkspace>();`
	`27`	`+#else`
	`28`	`+ public abstract class ToolPaneModel : ToolPaneModel`
	`29`	`+ {`
	`30`	`+#endif`
`25`	`31`	`public virtual void Show()`
`26`	`32`	`{`
`27`	`33`	`this.IsActive = true;`