Author: mkrueger
Date: 2008-02-14 10:22:36 -0500 (Thu, 14 Feb 2008)
New Revision: 95636
Modified:
trunk/monodevelop/main/src/addins/Mono.Texteditor/ChangeLog
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/Caret.cs
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextEditor.cs
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextViewMargin.cs
Log:
* Mono.TextEditor/TextViewMargin.cs, Mono.TextEditor/TextEditor.cs,
Mono.TextEditor/Caret.cs: Fixed caret drawing error.
Modified: trunk/monodevelop/main/src/addins/Mono.Texteditor/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/Mono.Texteditor/ChangeLog 2008-02-14
14:56:56 UTC (rev 95635)
+++ trunk/monodevelop/main/src/addins/Mono.Texteditor/ChangeLog 2008-02-14
15:22:36 UTC (rev 95636)
@@ -1,5 +1,10 @@
2008-02-14 Mike Krüger <[EMAIL PROTECTED]>
+ * Mono.TextEditor/TextViewMargin.cs, Mono.TextEditor/TextEditor.cs,
+ Mono.TextEditor/Caret.cs: Fixed caret drawing error.
+
+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.
Modified:
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/Caret.cs
===================================================================
--- trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/Caret.cs
2008-02-14 14:56:56 UTC (rev 95635)
+++ trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/Caret.cs
2008-02-14 15:22:36 UTC (rev 95636)
@@ -35,6 +35,7 @@
bool preserveSelection = false;
bool isInInsertMode = true;
bool autoScrollToCaret = true;
+ bool isHidden = false;
Document document;
public int Line {
@@ -123,6 +124,15 @@
autoScrollToCaret = value;
}
}
+
+ public bool IsHidden {
+ get {
+ return isHidden;
+ }
+ set {
+ isHidden = value;
+ }
+ }
public Caret (Document document)
{
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 14:56:56 UTC (rev 95635)
+++
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextEditor.cs
2008-02-14 15:22:36 UTC (rev 95636)
@@ -134,7 +134,9 @@
from = 0;
to = -delta;
}
+
DoFlipBuffer ();
+ Caret.IsHidden = true;
this.buffer.DrawDrawable (Style.BackgroundGC
(StateType.Normal),
this.flipBuffer,
0, from,
@@ -145,7 +147,9 @@
} else {
RenderMargins (buffer, new
Gdk.Rectangle (0, 0, Allocation.Width, -delta + this.LineHeight));
}
- GdkWindow.DrawDrawable (Style.BackgroundGC
(StateType.Normal),
+ Caret.IsHidden = false;
+
+ GdkWindow.DrawDrawable (Style.BackgroundGC
(StateType.Normal),
buffer,
0, 0,
0, 0,
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 14:56:56 UTC (rev 95635)
+++
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextViewMargin.cs
2008-02-14 15:22:36 UTC (rev 95636)
@@ -227,7 +227,7 @@
void DrawCaret (Gdk.Drawable win, char ch, int x, int y)
{
- if (!caretBlink || !textEditor.IsFocus)
+ if (Caret.IsHidden || !caretBlink ||
!textEditor.IsFocus)
return;
gc.RgbFgColor = ColorStyle.Caret;
if (Caret.IsInInsertMode) {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
