Commit 88b0e04d authored by Mikołaj Zalewski's avatar Mikołaj Zalewski Committed by Alexandre Julliard

comctl32: listview: Don't edit labels on click if the view was not focused.

parent 523cf3d4
...@@ -8253,6 +8253,7 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN ...@@ -8253,6 +8253,7 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN
{ {
LVHITTESTINFO lvHitTestInfo; LVHITTESTINFO lvHitTestInfo;
static BOOL bGroupSelect = TRUE; static BOOL bGroupSelect = TRUE;
BOOL bReceivedFocus = FALSE;
POINT pt = { x, y }; POINT pt = { x, y };
INT nItem; INT nItem;
...@@ -8261,7 +8262,11 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN ...@@ -8261,7 +8262,11 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN
/* send NM_RELEASEDCAPTURE notification */ /* send NM_RELEASEDCAPTURE notification */
if (!notify(infoPtr, NM_RELEASEDCAPTURE)) return 0; if (!notify(infoPtr, NM_RELEASEDCAPTURE)) return 0;
if (!infoPtr->bFocus) SetFocus(infoPtr->hwndSelf); if (!infoPtr->bFocus)
{
bReceivedFocus = TRUE;
SetFocus(infoPtr->hwndSelf);
}
/* set left button down flag and record the click position */ /* set left button down flag and record the click position */
infoPtr->bLButtonDown = TRUE; infoPtr->bLButtonDown = TRUE;
...@@ -8348,6 +8353,9 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN ...@@ -8348,6 +8353,9 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN
LISTVIEW_DeselectAll(infoPtr); LISTVIEW_DeselectAll(infoPtr);
ReleaseCapture(); ReleaseCapture();
} }
if (bReceivedFocus)
infoPtr->nEditLabelItem = -1;
return 0; return 0;
} }
......
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