riched20: Add support for ECO_NOHIDESEL flag.
Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
cc9c18a46d
commit
060d8c6abb
|
@ -3453,14 +3453,15 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
|
|||
ME_RewrapRepaint(editor);
|
||||
}
|
||||
|
||||
if ((changedSettings & settings & ES_NOHIDESEL) && !editor->bHaveFocus)
|
||||
ME_InvalidateSelection( editor );
|
||||
|
||||
if (changedSettings & settings & ECO_VERTICAL)
|
||||
FIXME("ECO_VERTICAL not implemented yet!\n");
|
||||
if (changedSettings & settings & ECO_AUTOHSCROLL)
|
||||
FIXME("ECO_AUTOHSCROLL not implemented yet!\n");
|
||||
if (changedSettings & settings & ECO_AUTOVSCROLL)
|
||||
FIXME("ECO_AUTOVSCROLL not implemented yet!\n");
|
||||
if (changedSettings & settings & ECO_NOHIDESEL)
|
||||
FIXME("ECO_NOHIDESEL not implemented yet!\n");
|
||||
if (changedSettings & settings & ECO_WANTRETURN)
|
||||
FIXME("ECO_WANTRETURN not implemented yet!\n");
|
||||
if (changedSettings & settings & ECO_AUTOWORDSELECTION)
|
||||
|
@ -4257,6 +4258,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
|
|||
editor->bHaveFocus = TRUE;
|
||||
ME_ShowCaret(editor);
|
||||
ME_SendOldNotify(editor, EN_SETFOCUS);
|
||||
if (!editor->bHideSelection && !(editor->styleFlags & ES_NOHIDESEL))
|
||||
ME_InvalidateSelection( editor );
|
||||
return 0;
|
||||
case WM_KILLFOCUS:
|
||||
ME_CommitUndo(editor); /* End coalesced undos for typed characters */
|
||||
|
@ -4264,6 +4267,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
|
|||
editor->wheel_remain = 0;
|
||||
ME_HideCaret(editor);
|
||||
ME_SendOldNotify(editor, EN_KILLFOCUS);
|
||||
if (!editor->bHideSelection && !(editor->styleFlags & ES_NOHIDESEL))
|
||||
ME_InvalidateSelection( editor );
|
||||
return 0;
|
||||
case WM_COMMAND:
|
||||
TRACE("editor wnd command = %d\n", LOWORD(wParam));
|
||||
|
|
|
@ -261,7 +261,8 @@ static void draw_space( ME_Context *c, ME_Run *run, int x, int y,
|
|||
|
||||
SetRect( &rect, x, ymin, x + run->nWidth, ymin + cy );
|
||||
|
||||
if (c->editor->bHideSelection) selected = FALSE;
|
||||
if (c->editor->bHideSelection || (!c->editor->bHaveFocus &&
|
||||
!(c->editor->styleFlags & ES_NOHIDESEL))) selected = FALSE;
|
||||
if (c->editor->bEmulateVersion10)
|
||||
{
|
||||
old_style_selected = selected;
|
||||
|
@ -355,7 +356,8 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y,
|
|||
HGDIOBJ hOldFont;
|
||||
int yOffset = 0;
|
||||
BOOL selected = (nSelFrom < run->len && nSelTo >= 0
|
||||
&& nSelFrom < nSelTo && !c->editor->bHideSelection);
|
||||
&& nSelFrom < nSelTo && !c->editor->bHideSelection &&
|
||||
(c->editor->bHaveFocus || (c->editor->styleFlags & ES_NOHIDESEL)));
|
||||
BOOL old_style_selected = FALSE;
|
||||
RECT sel_rect;
|
||||
HRGN clip = NULL, sel_rgn = NULL;
|
||||
|
|
Loading…
Reference in New Issue