From 337a21c7b838d8e5135fe3d28b320508442ad69c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 22 Mar 2017 12:30:59 +0300 Subject: - Clist_ClearSearch considered useless; - pfnDoSelectionDefaultAction rewritten to handle search correctly --- plugins/Clist_modern/src/modern_clc.cpp | 1 - plugins/Clist_nicer/src/clc.cpp | 34 ++++++++++++++++----------------- 2 files changed, 16 insertions(+), 19 deletions(-) (limited to 'plugins') diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp index e2bf1a11ed..056dae208d 100644 --- a/plugins/Clist_modern/src/modern_clc.cpp +++ b/plugins/Clist_modern/src/modern_clc.cpp @@ -449,7 +449,6 @@ static LRESULT clcOnKeyDown(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPARAM case VK_RETURN: pcli->pfnDoSelectionDefaultAction(hwnd, dat); SetCapture(hwnd); - Clist_ClearSearch(hwnd, dat); return 0; case VK_F2: cliBeginRenameSelection(hwnd, dat); /*SetCapture(hwnd);*/ return 0; diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp index 4d8e7a88c1..a185c7f40f 100644 --- a/plugins/Clist_nicer/src/clc.cpp +++ b/plugins/Clist_nicer/src/clc.cpp @@ -612,24 +612,22 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L pcli->pfnHideInfoTip(hwnd, dat); KillTimer(hwnd, TIMERID_RENAME); KillTimer(hwnd, TIMERID_INFOTIP); - dat->szQuickSearch[0] = 0; - { - DWORD hitFlags; - dat->selection = HitTest(hwnd, dat, (short)LOWORD(lParam), (short)HIWORD(lParam), &contact, NULL, &hitFlags); - if (hitFlags & CLCHT_ONITEMEXTRA) - break; - InvalidateRect(hwnd, NULL, FALSE); - if (dat->selection != -1) - pcli->pfnEnsureVisible(hwnd, dat, dat->selection, 0); - if (hitFlags & CLCHT_ONAVATAR && cfg::dat.bDblClkAvatars) { - CallService(MS_USERINFO_SHOWDIALOG, (WPARAM)contact->hContact, 0); - return TRUE; - } - if (hitFlags & (CLCHT_ONITEMICON | CLCHT_ONITEMLABEL | CLCHT_ONITEMSPACE)) { - UpdateWindow(hwnd); - pcli->pfnDoSelectionDefaultAction(hwnd, dat); - } + DWORD hitFlags; + dat->selection = HitTest(hwnd, dat, (short)LOWORD(lParam), (short)HIWORD(lParam), &contact, NULL, &hitFlags); + if (hitFlags & CLCHT_ONITEMEXTRA) + break; + + InvalidateRect(hwnd, NULL, FALSE); + if (dat->selection != -1) + pcli->pfnEnsureVisible(hwnd, dat, dat->selection, 0); + if (hitFlags & CLCHT_ONAVATAR && cfg::dat.bDblClkAvatars) { + CallService(MS_USERINFO_SHOWDIALOG, (WPARAM)contact->hContact, 0); + return TRUE; + } + if (hitFlags & (CLCHT_ONITEMICON | CLCHT_ONITEMLABEL | CLCHT_ONITEMSPACE)) { + UpdateWindow(hwnd); + pcli->pfnDoSelectionDefaultAction(hwnd, dat); } return TRUE; @@ -680,7 +678,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L PostMessage(GetParent(hwnd), WM_CONTEXTMENU, wParam, lParam); return 0; } - if (hMenu != NULL) { + if (hMenu != nullptr) { ClientToScreen(hwnd, &pt); TrackPopupMenu(hMenu, TPM_TOPALIGN | TPM_LEFTALIGN | TPM_RIGHTBUTTON, pt.x, pt.y, 0, hwnd, NULL); DestroyMenu(hMenu); -- cgit v1.2.3