Author: mkrueger
Date: 2008-01-27 15:38:40 -0500 (Sun, 27 Jan 2008)
New Revision: 94080
Modified:
trunk/monodevelop/main/src/addins/Mono.Texteditor/ChangeLog
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/FoldMarkerMargin.cs
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/IMargin.cs
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextEditor.cs
Log:
* Mono.TextEditor/FoldMarkerMargin.cs, Mono.TextEditor/IMargin.cs,
Mono.TextEditor/TextEditor.cs: Text cursor is now only for the text
region.
Modified: trunk/monodevelop/main/src/addins/Mono.Texteditor/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/Mono.Texteditor/ChangeLog 2008-01-27
20:04:53 UTC (rev 94079)
+++ trunk/monodevelop/main/src/addins/Mono.Texteditor/ChangeLog 2008-01-27
20:38:40 UTC (rev 94080)
@@ -1,5 +1,11 @@
2008-01-27 Mike Krüger <[EMAIL PROTECTED]>
+ * Mono.TextEditor/FoldMarkerMargin.cs, Mono.TextEditor/IMargin.cs,
+ Mono.TextEditor/TextEditor.cs: Text cursor is now only for the text
+ region.
+
+2008-01-27 Mike Krüger <[EMAIL PROTECTED]>
+
* Mono.TextEditor/DefaultEditActions.cs, Mono.TextEditor/TextEditor.cs:
Improved drag & drop support.
Modified:
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/FoldMarkerMargin.cs
===================================================================
---
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/FoldMarkerMargin.cs
2008-01-27 20:04:53 UTC (rev 94079)
+++
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/FoldMarkerMargin.cs
2008-01-27 20:38:40 UTC (rev 94080)
@@ -60,7 +60,7 @@
editor.QueueDraw ();
}
- public override void MouseDragged (int x, int y, bool
buttonPressed)
+ public override void MouseHover (int x, int y, bool
buttonPressed)
{
int lineNumber = editor.Document.VisualToLogicalLine
((int)(y + editor.TextEditorData.VAdjustment.Value) / editor.LineHeight);
lineHover = null;
Modified:
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/IMargin.cs
===================================================================
---
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/IMargin.cs
2008-01-27 20:04:53 UTC (rev 94079)
+++
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/IMargin.cs
2008-01-27 20:38:40 UTC (rev 94080)
@@ -46,7 +46,7 @@
void Draw (Gdk.Window win, Gdk.Rectangle area, int line, int x,
int y);
void MousePressed (int button, int x, int y, bool doubleClick);
- void MouseDragged (int x, int y, bool buttonPressed);
+ void MouseHover (int x, int y, bool buttonPressed);
void MouseLeft ();
}
@@ -81,7 +81,7 @@
{
}
- public virtual void MouseDragged (int x, int y, bool
buttonPressed)
+ public virtual void MouseHover (int x, int y, bool
buttonPressed)
{
}
Modified:
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextEditor.cs
===================================================================
---
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextEditor.cs
2008-01-27 20:04:53 UTC (rev 94079)
+++
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/TextEditor.cs
2008-01-27 20:38:40 UTC (rev 94080)
@@ -47,6 +47,7 @@
GutterMargin gutterMargin;
FoldMarkerMargin foldMarkerMargin;
+ Gdk.Cursor defaultCursor;
Gdk.Cursor textCursor;
int caretBlinkStatus;
uint caretBlinkTimeoutId = 0;
@@ -281,7 +282,7 @@
}
};
this.ColorStyle = new DefaultStyle (this);
-
+ defaultCursor = null;
textCursor = new Gdk.Cursor (Gdk.CursorType.Xterm);
OptionsChanged (this, EventArgs.Empty);
TextEditorOptions.Changed += OptionsChanged;
@@ -306,7 +307,6 @@
protected override void OnRealized ()
{
base.OnRealized ();
- this.GdkWindow.Cursor = textCursor;
}
@@ -538,7 +538,7 @@
selection = this.TextEditorData.SelectionRange;
inDrag = false;
} else if (margin != null) {
- margin.MouseDragged ((int)(e.X - startPos),
(int)e.Y, mousePressed);
+ margin.MouseHover ((int)(e.X - startPos),
(int)e.Y, mousePressed);
}
oldMargin = margin;
return base.OnMotionNotifyEvent (e);
@@ -941,8 +941,9 @@
return offset + (forwardDirection ? 0 : 1);
}
- public void MouseDragged (int x, int y, bool buttonPressed)
+ public void MouseHover (int x, int y, bool buttonPressed)
{
+ this.GdkWindow.Cursor = textCursor;
if (!buttonPressed)
return;
if (inSelectionDrag) {
@@ -961,6 +962,7 @@
public void MouseLeft ()
{
+ this.GdkWindow.Cursor = defaultCursor;
}
public void ScrollToCaret ()
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
