Nikolay Sivov : comctl32/edit: Handle focused cue text.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8bd48fd6d90fbf8e1f0e92a5ab0d6dab09faf439
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8bd48fd6d90fbf8e1f0e92a5a...

Author: Nikolay Sivov 
Date:   Wed Oct 31 15:57:50 2018 +0300

comctl32/edit: Handle focused cue text.

Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard

---

dlls/comctl32/edit.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c
index 249e08b..06e1f49 100644
--- a/dlls/comctl32/edit.c
+++ b/dlls/comctl32/edit.c
@@ -129,7 +129,9 @@ typedef struct
    				   should be sent to the first parent. */
    HWND hwndListBox;		/* handle of ComboBox's listbox or NULL */
    INT wheelDeltaRemainder;        /* scroll wheel delta left over after scrolling whole lines */
-       WCHAR *cue_banner_text;
+	WCHAR *cue_banner_text;
+	BOOL cue_banner_draw_focused;
+
    /*
     *	only for multi line controls
     */
@@ -2181,7 +2183,7 @@ static void EDIT_PaintLine(EDITSTATE *es, HDC dc, INT line, BOOL rev)
    } else
    	x += EDIT_PaintText(es, dc, x, y, line, 0, ll, FALSE);

-       if (es->cue_banner_text && es->text_length == 0 && !(es->flags & EF_FOCUSED))
+       if (es->cue_banner_text && es->text_length == 0 && (!(es->flags & EF_FOCUSED) || es->cue_banner_draw_focused))
        {
           SetTextColor(dc, GetSysColor(COLOR_GRAYTEXT));
           TextOutW(dc, x, y, es->cue_banner_text, strlenW(es->cue_banner_text));
@@ -4170,16 +4172,14 @@ static inline WCHAR *heap_strdupW(const WCHAR *str)
  *	EM_SETCUEBANNER
  *
  */
-static BOOL EDIT_EM_SetCueBanner(EDITSTATE *es, BOOL focus, const WCHAR *cue_text)
+static BOOL EDIT_EM_SetCueBanner(EDITSTATE *es, BOOL draw_focused, const WCHAR *cue_text)
 {
     if (es->style & ES_MULTILINE || !cue_text)
         return FALSE;

-    if (focus)
-        FIXME("cue banner for focused control not implemented.\n");
-
     heap_free(es->cue_banner_text);
     es->cue_banner_text = heap_strdupW(cue_text);
+    es->cue_banner_draw_focused = draw_focused;

return TRUE;
 }