From 8e2bd583c1259bf0c93c1c7e8a677629b2d3512b Mon Sep 17 00:00:00 2001 From: Michael Becker Date: Wed, 20 May 2020 13:18:15 -0400 Subject: [PATCH] properly set Editor.Title --- Libraries/UniversalEditor.UserInterface/Editor.cs | 2 +- .../UniversalEditor.UserInterface/Pages/EditorPage.cs | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Libraries/UniversalEditor.UserInterface/Editor.cs b/Libraries/UniversalEditor.UserInterface/Editor.cs index 0b20ea6e..bfef5fe8 100644 --- a/Libraries/UniversalEditor.UserInterface/Editor.cs +++ b/Libraries/UniversalEditor.UserInterface/Editor.cs @@ -206,7 +206,7 @@ namespace UniversalEditor.UserInterface } #region IEditorImplementation Members - public virtual string Title { get { return String.Empty; } } + public string Title { get; set; } private ObjectModel mvarObjectModel = null; public ObjectModel ObjectModel diff --git a/Libraries/UniversalEditor.UserInterface/Pages/EditorPage.cs b/Libraries/UniversalEditor.UserInterface/Pages/EditorPage.cs index 7bea532f..eb174735 100644 --- a/Libraries/UniversalEditor.UserInterface/Pages/EditorPage.cs +++ b/Libraries/UniversalEditor.UserInterface/Pages/EditorPage.cs @@ -125,6 +125,8 @@ namespace UniversalEditor.UserInterface.Pages // pnlLoading.Enabled = true; // pnlLoading.Visible = true; + string title = String.IsNullOrEmpty(Title) ? Document.Title : Title; + ObjectModel om = null; EditorReference[] reditors = new EditorReference[0]; if (mvarDocument.ObjectModel != null) @@ -178,7 +180,7 @@ namespace UniversalEditor.UserInterface.Pages mvarDocument.Accessor.Close(); if (ed == null) return; - + ed.Title = title; ed.DocumentEdited += editor_DocumentEdited; mvarDocument.ObjectModel = ed.ObjectModel; @@ -228,7 +230,7 @@ namespace UniversalEditor.UserInterface.Pages // editor.Dock = DockStyle.Fill; editor.ObjectModel = om; editor.DocumentEdited += editor_DocumentEdited; - + editor.Title = title; for (int j = 0; j < reditor.Views.Count; j++) { EditorView view = reditor.Views[j]; @@ -252,6 +254,7 @@ namespace UniversalEditor.UserInterface.Pages for (int i = 0; i < Controls.Count - 1; i++) { (Controls[i] as Editor).ObjectModel = om; + (Controls[i] as Editor).Title = title; } } }