diff options
| author | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2011-10-29 04:52:08 +0400 |
|---|---|---|
| committer | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2011-10-29 04:52:08 +0400 |
| commit | c9466c714dc7e999ce7e5353cc55bdda2ded22a7 (patch) | |
| tree | 29a1c0fda02fd305a22ffb9ea07bec206d6403ec /main/src/addins/VersionControl | |
| parent | 7dc4933b653457e5f5c4f482699f9e1972d2cfb5 (diff) | |
[VersionControl] MergeWidget should use source editor font
Diffstat (limited to 'main/src/addins/VersionControl')
| -rw-r--r-- | main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs index 9ab8a99e25..f9a87a1525 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs @@ -35,6 +35,7 @@ using MonoDevelop.Ide; using MonoDevelop.Components; using System.ComponentModel; using MonoDevelop.Core; +using MonoDevelop.Ide.Gui; namespace MonoDevelop.VersionControl.Views { @@ -105,7 +106,12 @@ namespace MonoDevelop.VersionControl.Views protected override void CreateComponents () { - this.editors = new [] { new TextEditor (), new TextEditor (), new TextEditor () }; + this.editors = new [] { + new TextEditor (new Mono.TextEditor.Document (), new CommonTextEditorOptions ()), + new TextEditor (new Mono.TextEditor.Document (), new CommonTextEditorOptions ()), + new TextEditor (new Mono.TextEditor.Document (), new CommonTextEditorOptions ()), + }; + this.editors[0].Document.ReadOnly = true; this.editors[2].Document.ReadOnly = true; @@ -242,7 +248,7 @@ namespace MonoDevelop.VersionControl.Views void UpdateConflictsOnTextReplace (object sender, ReplaceEventArgs e) { this.UpdateDiff (); - Document.UpdateSegments (GetAllConflictingSegments (), e); + Mono.TextEditor.Document.UpdateSegments (GetAllConflictingSegments (), e); } } }
\ No newline at end of file |