Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Krüger <mkrueger@xamarin.com>2013-08-13 12:31:00 +0400
committerMike Krüger <mkrueger@xamarin.com>2013-08-13 12:31:00 +0400
commita7db96c74a361a460e7602acc6c937204c4f8690 (patch)
treeb782674ab97e2ab37dbb925f45b81b24003373a0 /main/src/core/Mono.Texteditor
parent2d50f3f5b662c1183de33de5036d0b35b1c6fbf2 (diff)
[TextEditor] Enabled word wrap option.
Diffstat (limited to 'main/src/core/Mono.Texteditor')
-rw-r--r--main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextViewMargin.cs2
-rw-r--r--main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorOptions.cs4
2 files changed, 2 insertions, 4 deletions
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextViewMargin.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextViewMargin.cs
index 0faf6163e7..b38ba93fbf 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextViewMargin.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextViewMargin.cs
@@ -1066,7 +1066,7 @@ namespace Mono.TextEditor
descriptor = new LayoutDescriptor (line, offset, length, wrapper, selectionStart, selectionEnd);
if (!containsPreedit)
layoutDict [line] = descriptor;
- //textEditor.GetTextEditorData ().HeightTree.SetLineHeight (line.LineNumber, System.Math.Max (LineHeight, System.Math.Floor (h / Pango.Scale.PangoScale)));
+ textEditor.GetTextEditorData ().HeightTree.SetLineHeight (line.LineNumber, System.Math.Max (LineHeight, System.Math.Floor (h / Pango.Scale.PangoScale)));
return wrapper;
}
diff --git a/main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorOptions.cs b/main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorOptions.cs
index e8803de452..190506b305 100644
--- a/main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorOptions.cs
+++ b/main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorOptions.cs
@@ -498,9 +498,7 @@ namespace Mono.TextEditor
bool wrapLines = false;
public virtual bool WrapLines {
get {
- // Doesn't work atm
- return false;
-// return wrapLines;
+ return wrapLines;
}
set {
if (wrapLines != value) {