Browse Source

AvalonEdit: scroll when mouse is moved close to border while selecting text.

NewFileDialog: fixed bug that caused file names to not contain ${Number}.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4850 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 16 years ago
parent
commit
7aab8df4ba
  1. 7
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/Caret.cs
  2. 1
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/SelectionMouseHandler.cs
  3. 4
      src/Main/Base/Project/Src/Gui/Dialogs/NewFileDialog.cs

7
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/Caret.cs

@ -307,11 +307,16 @@ namespace ICSharpCode.AvalonEdit.Editing
/// Scrolls the text view so that the caret is visible. /// Scrolls the text view so that the caret is visible.
/// </summary> /// </summary>
public void BringCaretToView() public void BringCaretToView()
{
BringCaretToView(MinimumDistanceToViewBorder);
}
internal void BringCaretToView(double border)
{ {
if (textView != null) { if (textView != null) {
VisualLine visualLine = textView.GetOrConstructVisualLine(textView.Document.GetLineByNumber(position.Line)); VisualLine visualLine = textView.GetOrConstructVisualLine(textView.Document.GetLineByNumber(position.Line));
Rect caretRectangle = CalcCaretRectangle(visualLine); Rect caretRectangle = CalcCaretRectangle(visualLine);
caretRectangle.Inflate(MinimumDistanceToViewBorder, MinimumDistanceToViewBorder); caretRectangle.Inflate(border, border);
textView.MakeVisible(caretRectangle); textView.MakeVisible(caretRectangle);
} }
} }

1
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/SelectionMouseHandler.cs

@ -530,6 +530,7 @@ namespace ICSharpCode.AvalonEdit.Editing
SetCaretOffsetToMousePosition(e, textArea.Selection.SurroundingSegment); SetCaretOffsetToMousePosition(e, textArea.Selection.SurroundingSegment);
} }
} }
textArea.Caret.BringCaretToView(5.0);
} }
#endregion #endregion

4
src/Main/Base/Project/Src/Gui/Dialogs/NewFileDialog.cs

@ -314,9 +314,9 @@ namespace ICSharpCode.SharpDevelop.Gui
} }
} }
if (found == false) if (found == false)
break; return fileName;
} else if (!File.Exists(Path.Combine(basePath, fileName))) { } else if (!File.Exists(Path.Combine(basePath, fileName))) {
break; return fileName;
} }
++curNumber; ++curNumber;
} }

Loading…
Cancel
Save