Author: mkrueger
Date: 2008-02-14 08:11:00 -0500 (Thu, 14 Feb 2008)
New Revision: 95625
Modified:
trunk/monodevelop/main/src/addins/Mono.Texteditor/ChangeLog
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/ISegment.cs
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/LineSegment.cs
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/Segment.cs
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextViewMargin.cs
Log:
* Mono.TextEditor/ISegment.cs, Mono.TextEditor/TextViewMargin.cs,
Mono.TextEditor/Segment.cs, Mono.TextEditor/LineSegment.cs: Fixed
folding marker drawing.
Modified: trunk/monodevelop/main/src/addins/Mono.Texteditor/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/Mono.Texteditor/ChangeLog 2008-02-14
13:01:05 UTC (rev 95624)
+++ trunk/monodevelop/main/src/addins/Mono.Texteditor/ChangeLog 2008-02-14
13:11:00 UTC (rev 95625)
@@ -1,5 +1,11 @@
2008-02-14 Mike Krüger <[EMAIL PROTECTED]>
+ * Mono.TextEditor/ISegment.cs, Mono.TextEditor/TextViewMargin.cs,
+ Mono.TextEditor/Segment.cs, Mono.TextEditor/LineSegment.cs: Fixed
+ folding marker drawing.
+
+2008-02-14 Mike Krüger <[EMAIL PROTECTED]>
+
* TangoLightStyle.xml, OblivionStyle.xml, UbuntuStyle.xml,
Mono.TextEditor/TextViewMargin.cs, Mono.TextEditor/TextEditor.cs,
Mono.TextEditor.Highlighting/Style.cs, C64Style.xml: Fixed some
drawing
Modified:
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/ISegment.cs
===================================================================
---
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/ISegment.cs
2008-02-14 13:01:05 UTC (rev 95624)
+++
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/ISegment.cs
2008-02-14 13:11:00 UTC (rev 95625)
@@ -46,6 +46,7 @@
}
bool Contains (int offset);
+ bool Contains (ISegment segment);
}
}
Modified:
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/LineSegment.cs
===================================================================
---
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/LineSegment.cs
2008-02-14 13:01:05 UTC (rev 95624)
+++
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/LineSegment.cs
2008-02-14 13:11:00 UTC (rev 95625)
@@ -159,6 +159,10 @@
{
return Offset <= offset && offset < EndOffset;
}
+ public bool Contains (ISegment segment)
+ {
+ return Offset <= segment.Offset && segment.EndOffset <
EndOffset;
+ }
public override string ToString ()
{
Modified:
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/Segment.cs
===================================================================
---
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/Segment.cs
2008-02-14 13:01:05 UTC (rev 95624)
+++
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/Segment.cs
2008-02-14 13:11:00 UTC (rev 95625)
@@ -72,6 +72,10 @@
{
return Offset <= offset && offset < EndOffset;
}
+ public bool Contains (ISegment segment)
+ {
+ return Offset <= segment.Offset && segment.EndOffset <
EndOffset;
+ }
public override string ToString ()
{
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 13:01:05 UTC (rev 95624)
+++
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextViewMargin.cs
2008-02-14 13:11:00 UTC (rev 95625)
@@ -584,11 +584,13 @@
layout.SetText (folding.Description);
layout.GetPixelSize (out width, out
height);
- gc.RgbBgColor = ColorStyle.Background;
- gc.RgbFgColor = ColorStyle.FoldLine;
- win.DrawRectangle (gc, false, new
Rectangle (xPos, y, width, this.LineHeight - 1));
+ bool isFoldingSelected =
TextEditorData.IsSomethingSelected && TextEditorData.SelectionRange.Contains
(folding);
+ gc.RgbFgColor = isFoldingSelected ?
ColorStyle.SelectedBg : ColorStyle.Background;
+ win.DrawRectangle (gc, true, new
Rectangle (xPos, y, width - 1, this.LineHeight - 1));
+ gc.RgbFgColor = isFoldingSelected ?
ColorStyle.SelectedFg : ColorStyle.FoldLine;
+ win.DrawRectangle (gc, false, new
Rectangle (xPos, y, width - 1, this.LineHeight - 1));
- gc.RgbFgColor = ColorStyle.FoldLine;
+ gc.RgbFgColor = isFoldingSelected ?
ColorStyle.SelectedFg : ColorStyle.FoldLine;
win.DrawLayout (gc, xPos, y, layout);
if (caretOffset == foldOffset)
DrawCaret (win,
folding.Description[0], xPos, y);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
