diff options
Diffstat (limited to 'main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs')
| -rw-r--r-- | main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs index 614ba73928..3a892fa547 100644 --- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs +++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingPolicyPanelWidget.cs @@ -26,6 +26,7 @@ using System; using MonoDevelop.Ide; using MonoDevelop.Ide.Gui.Content; +using MonoDevelop.Ide.Editor; namespace MonoDevelop.CSharp.Formatting @@ -33,7 +34,8 @@ namespace MonoDevelop.CSharp.Formatting [System.ComponentModel.ToolboxItem(true)] partial class CSharpFormattingPolicyPanelWidget : Gtk.Bin { - readonly Mono.TextEditor.TextEditor texteditor = new Mono.TextEditor.TextEditor (); + readonly TextEditor texteditor = TextEditorFactory.CreateNewEditor (); + // Gtk.ListStore model = new Gtk.ListStore (typeof(string)); // List<CSharpFormattingPolicy> policies = new List<CSharpFormattingPolicy> (); const string example = @"using System; @@ -50,14 +52,14 @@ namespace Example { }"; TextStylePolicy textStylePolicy; CSharpFormattingPolicy policy; - public CSharpFormattingPolicy Policy { + internal CSharpFormattingPolicy Policy { get { return policy; } } - public void SetPolicy (CSharpFormattingPolicy formattingPolicy, TextStylePolicy textStylePolicy) + internal void SetPolicy (CSharpFormattingPolicy formattingPolicy, TextStylePolicy textStylePolicy) { policy = formattingPolicy; this.textStylePolicy = textStylePolicy; @@ -77,26 +79,18 @@ namespace Example { policy = new CSharpFormattingPolicy (); buttonEdit.Clicked += HandleButtonEditClicked; - var options = MonoDevelop.SourceEditor.DefaultSourceEditorOptions.Instance; - texteditor.Options.FontName = options.FontName; - texteditor.Options.ColorScheme = options.ColorScheme; - texteditor.Options.ShowFoldMargin = false; - texteditor.Options.ShowIconMargin = false; - texteditor.Options.ShowLineNumberMargin = false; - texteditor.Document.ReadOnly = true; - texteditor.Document.MimeType = CSharpFormatter.MimeType; + texteditor.Options = DefaultSourceEditorOptions.PlainEditor; + texteditor.IsReadOnly = true; + texteditor.MimeType = CSharpFormatter.MimeType; scrolledwindow1.Child = texteditor; ShowAll (); } public void FormatSample () { - if (textStylePolicy != null) { - texteditor.Options.IndentationSize = textStylePolicy.IndentWidth; - texteditor.Options.TabSize = textStylePolicy.TabWidth; - texteditor.Options.TabsToSpaces = textStylePolicy.TabsToSpaces; - } - texteditor.Document.Text = CSharpFormatter.FormatText (policy, textStylePolicy, CSharpFormatter.MimeType, example, 0, example.Length); + texteditor.Options = DefaultSourceEditorOptions.Instance.WithTextStyle (textStylePolicy); + + texteditor.Text = CSharpFormatter.FormatText (policy, textStylePolicy, CSharpFormatter.MimeType, example, 0, example.Length); } void HandleButtonEditClicked (object sender, EventArgs e) |