Skip to content

W
wine-winehq
Commit da058cbf authored by Dylan Smith's avatar Dylan Smith Committed by Alexandre Julliard
Browse files
Options

richedit: Handle deletion at the end of text properly.

parent abde9a91
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
dlls/riched20/paint.c
View file @ da058cbf
...@@ -1072,6 +1072,7 @@ void ME_Scroll(ME_TextEditor *editor, int value, int type) ...@@ -1072,6 +1072,7 @@ void ME_Scroll(ME_TextEditor *editor, int value, int type)
} }
nNewPos = SetScrollInfo(editor->hWnd, SB_VERT, &si, editor->bRedraw); nNewPos = SetScrollInfo(editor->hWnd, SB_VERT, &si, editor->bRedraw);
editor->vert_si.nPos = nNewPos;
nActualScroll = nOrigPos - nNewPos; nActualScroll = nOrigPos - nNewPos;
if (editor->bRedraw) if (editor->bRedraw)
{ {
...@@ -1105,7 +1106,7 @@ void ME_Scroll(ME_TextEditor *editor, int value, int type) ...@@ -1105,7 +1106,7 @@ void ME_Scroll(ME_TextEditor *editor, int value, int type)
bScrollBarWasVisible = ME_GetYScrollVisible(editor); bScrollBarWasVisible = ME_GetYScrollVisible(editor);
bScrollBarWillBeVisible = editor->nHeight > editor->sizeWindow.cy; bScrollBarWillBeVisible = editor->nHeight > editor->sizeWindow.cy;
si.fMask = SIF_PAGE | SIF_RANGE; si.fMask = SIF_PAGE | SIF_RANGE | SIF_POS;
if (GetWindowLongW(hWnd, GWL_STYLE) & ES_DISABLENOSCROLL) if (GetWindowLongW(hWnd, GWL_STYLE) & ES_DISABLENOSCROLL)
si.fMask |= SIF_DISABLENOSCROLL; si.fMask |= SIF_DISABLENOSCROLL;
if ((si.fMask & SIF_DISABLENOSCROLL)) if ((si.fMask & SIF_DISABLENOSCROLL))
...@@ -1122,7 +1123,7 @@ void ME_Scroll(ME_TextEditor *editor, int value, int type) ...@@ -1122,7 +1123,7 @@ void ME_Scroll(ME_TextEditor *editor, int value, int type)
si.nMin = 0; si.nMin = 0;
si.nMax = editor->nTotalLength; si.nMax = editor->nTotalLength;
si.nPos = editor->vert_si.nPos;
si.nPage = editor->sizeWindow.cy; si.nPage = editor->sizeWindow.cy;
if (!(si.nMin == editor->vert_si.nMin && si.nMax == editor->vert_si.nMax && si.nPage == editor->vert_si.nPage)) if (!(si.nMin == editor->vert_si.nMin && si.nMax == editor->vert_si.nMax && si.nPage == editor->vert_si.nPage))
...@@ -1138,17 +1139,18 @@ void ME_Scroll(ME_TextEditor *editor, int value, int type) ...@@ -1138,17 +1139,18 @@ void ME_Scroll(ME_TextEditor *editor, int value, int type)
else else
{ {
if (bScrollBarWasVisible && !(si.fMask & SIF_DISABLENOSCROLL)) if (bScrollBarWasVisible && !(si.fMask & SIF_DISABLENOSCROLL))
{
SetScrollInfo(hWnd, SB_VERT, &si, TRUE);
ShowScrollBar(hWnd, SB_VERT, FALSE); ShowScrollBar(hWnd, SB_VERT, FALSE);
ME_ScrollAbs(editor, 0);
}
} }
} }
} }
int ME_GetYScrollPos(ME_TextEditor *editor) int ME_GetYScrollPos(ME_TextEditor *editor)
{ {
SCROLLINFO si; return editor->vert_si.nPos;
si.cbSize = sizeof(si);
si.fMask = SIF_POS;
return GetScrollInfo(editor->hWnd, SB_VERT, &si) ? si.nPos : 0;
} }
BOOL ME_GetYScrollVisible(ME_TextEditor *editor) BOOL ME_GetYScrollVisible(ME_TextEditor *editor)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment