diff options
| author | nyamatongwe <devnull@localhost> | 2000-06-22 14:01:20 +0000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2000-06-22 14:01:20 +0000 |
| commit | e448128c06157e09c2355255e1db6a81e075596e (patch) | |
| tree | 5035413c581ec5d70b938f0e0b3227b657837b29 | |
| parent | bd63a4f381e57366d0d9e58f57242eaa5f4c79c2 (diff) | |
| download | scintilla-mirror-e448128c06157e09c2355255e1db6a81e075596e.tar.gz | |
Caret stability when adding or deleting characters.
Caret redisplayed when focus in on GTK+.
Fixed whitespace visible after indentation option.
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 1 | ||||
| -rw-r--r-- | src/Editor.cxx | 6 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index bece77e59..d14bc57ac 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -157,6 +157,7 @@ gint ScintillaGTK::FocusIn(GtkWidget *widget, GdkEventFocus * /*event*/, Scintil GTK_WIDGET_SET_FLAGS(widget, GTK_HAS_FOCUS); sciThis->NotifyFocus(true); sciThis->ShowCaretAtCurrentPosition(); + sciThis->InvalidateCaret(); return FALSE; } diff --git a/src/Editor.cxx b/src/Editor.cxx index 14dbb87df..abfa947f0 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -1404,6 +1404,8 @@ void Editor::AddCharUTF(char *s, unsigned int len) { pdoc->InsertString(currentPos, s, len); SetEmptySelection(currentPos + len); EnsureCaretVisible(); + // Avoid blinking during rapid typing: + ShowCaretAtCurrentPosition(); SetLastXChosen(); NotifyChar(s[0]); } @@ -1510,6 +1512,8 @@ void Editor::Redo() { void Editor::DelChar() { pdoc->DelChar(currentPos); + // Avoid blinking during rapid typing: + ShowCaretAtCurrentPosition(); } void Editor::DelCharBack() { @@ -1520,6 +1524,8 @@ void Editor::DelCharBack() { ClearSelection(); SetEmptySelection(currentPos); } + // Avoid blinking during rapid typing: + ShowCaretAtCurrentPosition(); } void Editor::NotifyFocus(bool) { diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 140d0de87..b823ebd05 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -259,9 +259,6 @@ static int InputCodePage() { return atoi(sCodePage); } -//#undef DefWindowProc -//#define DefWindowProc DefWindowProcW - LRESULT ScintillaWin::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) { switch (iMessage) { |