riched20: Remove the caret at end hack.

The end of one run already has a different cursor to the beginning of the next run. Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

riched20: Remove the caret at end hack.
dd134546 · Huw Davies · Alexandre Julliard · c8862864 · dd134546 · dd134546
Commit dd134546 authored Oct 23, 2020 by Huw Davies Committed by Alexandre Julliard Oct 23, 2020
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 97 deletions

caret.c dlls/riched20/caret.c +20 -91

editor.c dlls/riched20/editor.c +0 -1

editstr.h dlls/riched20/editstr.h +0 -1

table.c dlls/riched20/table.c +1 -4

No files found.
--- a/dlls/riched20/caret.c
+++ b/dlls/riched20/caret.c
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -3121,7 +3121,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10)
  ed->nUDArrowX = -1;
  ed->rgbBackColor = -1;
  ed->hbrBackground = GetSysColorBrush(COLOR_WINDOW);
-  ed->bCaretAtEnd = FALSE;
  ed->nEventMask = 0;
  ed->nModifyStep = 0;
  ed->nTextLimit = TEXT_LIMIT_DEFAULT;

--- a/dlls/riched20/editstr.h
+++ b/dlls/riched20/editstr.h
@@ -398,7 +398,6 @@ typedef struct tagME_TextEditor
  int total_rows;
  COLORREF rgbBackColor;
  HBRUSH hbrBackground;
-  BOOL bCaretAtEnd;
  int nEventMask;
  int nModifyStep;
  struct list undo_stack;

--- a/dlls/riched20/table.c
+++ b/dlls/riched20/table.c
@@ -625,10 +625,7 @@ void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow)
      editor->pCursors[0] = fromCursor;
      editor->pCursors[1] = fromCursor;
      /* FIXME: For some reason the caret is shown at the start of the
-       *        previous paragraph in v1.0 to v3.0, and bCaretAtEnd only works
-       *        within the paragraph for wrapped lines. */
-      if (ME_FindItemBack(fromCursor.pRun, diRun))
-        editor->bCaretAtEnd = TRUE;
+       *        previous paragraph in v1.0 to v3.0 */
    } else if ((bSelectedRow || !ME_IsInTable(toCursor.pRun))) {
      ME_SelectOrInsertNextCell(editor, fromCursor.pRun);
    } else {