From 140fee179040c68717f46bfd076949a58bb7ed63 Mon Sep 17 00:00:00 2001 From: Dylan Smith Date: Thu, 16 Jul 2009 20:01:25 -0400 Subject: [PATCH] richedit: Prevent autoscrolling without ES_AUTO[VH]SCROLL style. When the richedit control is created without the ES_AUTOHSCROLL or the ES_AUTOVSCROLL, then scrolling isn't done automatically when moving the cursor with the arrow keys, drag selecting with the mouse, or even from using the EM_SCROLLCARET (based on testing using a modified version of wordpad). --- dlls/riched20/paint.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 620ac69160c..bc62bdb4915 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1242,11 +1242,21 @@ void ME_EnsureVisible(ME_TextEditor *editor, ME_Cursor *pCursor) assert(pRow); assert(pPara); - x = pRun->pt.x + ME_PointFromChar(editor, pRun, pCursor->nOffset); - if (x > editor->horz_si.nPos + editor->sizeWindow.cx) - x = x + 1 - editor->sizeWindow.cx; - else if (x > editor->horz_si.nPos) + if (editor->styleFlags & ES_AUTOHSCROLL) + { + x = pRun->pt.x + ME_PointFromChar(editor, pRun, pCursor->nOffset); + if (x > editor->horz_si.nPos + editor->sizeWindow.cx) + x = x + 1 - editor->sizeWindow.cx; + else if (x > editor->horz_si.nPos) + x = editor->horz_si.nPos; + + if (~editor->styleFlags & ES_AUTOVSCROLL) + ME_HScrollAbs(editor, x); + } else { + if (~editor->styleFlags & ES_AUTOVSCROLL) + return; x = editor->horz_si.nPos; + } y = pPara->member.para.pt.y + pRow->member.row.pt.y; yheight = pRow->member.row.nHeight; -- 2.11.4.GIT