Author: mkrueger
Date: 2008-02-14 15:59:54 -0500 (Thu, 14 Feb 2008)
New Revision: 95692
Modified:
trunk/monodevelop/main/src/addins/Mono.Texteditor/ChangeLog
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor.Highlighting/SemanticRule.cs
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextEditor.cs
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextMarker.cs
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextViewMargin.cs
Log:
* Mono.TextEditor/TextViewMargin.cs, Mono.TextEditor/TextMarker.cs,
Mono.TextEditor/TextEditor.cs,
Mono.TextEditor.Highlighting/SemanticRule.cs: Url textmarker now
has a type enum.
Modified: trunk/monodevelop/main/src/addins/Mono.Texteditor/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/Mono.Texteditor/ChangeLog 2008-02-14
20:26:33 UTC (rev 95691)
+++ trunk/monodevelop/main/src/addins/Mono.Texteditor/ChangeLog 2008-02-14
20:59:54 UTC (rev 95692)
@@ -1,5 +1,12 @@
2008-02-14 Mike Krüger <[EMAIL PROTECTED]>
+ * Mono.TextEditor/TextViewMargin.cs, Mono.TextEditor/TextMarker.cs,
+ Mono.TextEditor/TextEditor.cs,
+ Mono.TextEditor.Highlighting/SemanticRule.cs: Url textmarker now has a
+ type enum.
+
+2008-02-14 Mike Krüger <[EMAIL PROTECTED]>
+
* Mono.TextEditor/TextViewMargin.cs: Fixed bug in ColumnToVisualX.
2008-02-14 Mike Krüger <[EMAIL PROTECTED]>
Modified:
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextEditor.cs
===================================================================
---
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextEditor.cs
2008-02-14 20:26:33 UTC (rev 95691)
+++
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextEditor.cs
2008-02-14 20:59:54 UTC (rev 95692)
@@ -699,7 +699,7 @@
}
}
- double oldVadjustment = 0;
+ //double oldVadjustment = 0;
protected override bool OnExposeEvent (Gdk.EventExpose e)
{
if (oldRequest != Splitter.LineCount * this.LineHeight)
{
Modified:
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextMarker.cs
===================================================================
---
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextMarker.cs
2008-02-14 20:26:33 UTC (rev 95691)
+++
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextMarker.cs
2008-02-14 20:59:54 UTC (rev 95692)
@@ -28,6 +28,12 @@
namespace Mono.TextEditor
{
+ public enum UrlType {
+ Unknown,
+ Url,
+ Email
+ }
+
public class UrlMarker : TextMarker
{
string url;
@@ -35,17 +41,37 @@
int startColumn;
int endColumn;
LineSegment line;
+ UrlType urlType;
public string Url {
get {
return url;
}
}
+
+ public int StartColumn {
+ get {
+ return startColumn;
+ }
+ }
+
+ public int EndColumn {
+ get {
+ return endColumn;
+ }
+ }
+
+ public UrlType UrlType {
+ get {
+ return urlType;
+ }
+ }
- public UrlMarker (LineSegment line, string url, string style,
int startColumn, int endColumn)
+ public UrlMarker (LineSegment line, string url, UrlType
urlType, string style, int startColumn, int endColumn)
{
this.line = line;
this.url = url;
+ this.urlType = urlType;
this.style = style;
this.startColumn = startColumn;
this.endColumn = endColumn;
Modified:
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextViewMargin.cs
===================================================================
---
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextViewMargin.cs
2008-02-14 20:26:33 UTC (rev 95691)
+++
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextViewMargin.cs
2008-02-14 20:59:54 UTC (rev 95692)
@@ -256,9 +256,6 @@
{
SyntaxMode mode = Document.SyntaxMode != null &&
TextEditorOptions.Options.EnableSyntaxHighlighting ? Document.SyntaxMode :
SyntaxMode.Default;
Chunk[] chunks = mode.GetChunks (Document,
TextEditorData.ColorStyle, line, offset, length);
-// int start = offset;
- int xStart = xPos;
- int index = line.Offset + line.EditableLength - offset;
int selectionStart = TextEditorData.SelectionStart !=
null ? TextEditorData.SelectionStart.Segment.Offset +
TextEditorData.SelectionStart.Column : -1;
int selectionEnd = TextEditorData.SelectionEnd != null
? TextEditorData.SelectionEnd.Segment.Offset +
TextEditorData.SelectionEnd.Column : -1;
int visibleColumn = 0;
Modified:
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor.Highlighting/SemanticRule.cs
===================================================================
---
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor.Highlighting/SemanticRule.cs
2008-02-14 20:26:33 UTC (rev 95691)
+++
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor.Highlighting/SemanticRule.cs
2008-02-14 20:59:54 UTC (rev 95692)
@@ -65,10 +65,10 @@
int startColumn = startOffset - line.Offset;
line.RemoveMarker (typeof(UrlMarker));
foreach (System.Text.RegularExpressions.Match m in
urlRegex.Matches (text)) {
- line.AddMarker (new UrlMarker (line, m.Value,
syntax, startColumn + m.Index, startColumn + m.Index + m.Length));
+ line.AddMarker (new UrlMarker (line, m.Value,
UrlType.Url, syntax, startColumn + m.Index, startColumn + m.Index + m.Length));
}
foreach (System.Text.RegularExpressions.Match m in
mailRegex.Matches (text)) {
- line.AddMarker (new UrlMarker (line, m.Value,
syntax, startColumn + m.Index, startColumn + m.Index + m.Length));
+ line.AddMarker (new UrlMarker (line, m.Value,
UrlType.Email, syntax, startColumn + m.Index, startColumn + m.Index +
m.Length));
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
