Skip to content

Improve accuracy to colorize matches #570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stefankueng merged 1 commit into from
Nov 26, 2025
Merged

Improve accuracy to colorize matches #570

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions src/SearchDlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2715,35 +2715,37 @@ LRESULT CSearchDlg::ColorizeMatchResultProc(LPNMLVCUSTOMDRAW lpLVCD)
}
if (ListView_GetItem(hListControl, &lv))
{
LPWSTR pMatch = lv.pszText + colMatch;
SIZE textSize = {0, 0};
LPWSTR pMatch = lv.pszText + colMatch;
RECT rc2 = {0, 0, 0, 0};
LONG width;

rc.left += 6;
rc.right -= 6;

// Not precise sometimes.
// We keep the text and draw a transparent rectangle only. So, will not break the text.
GetTextExtentPoint32(hdc, lv.pszText, colMatch, &textSize);
rc.left += textSize.cx;
// GetTextExtentPoint32 is not accurate sometimes.
DrawTextEx(hdc, lv.pszText, colMatch, &rc2, DT_CALCRECT | DT_NOPREFIX | DT_SINGLELINE, NULL);
width = rc2.right - rc2.left;
rc.left += width;
if (rc.left >= rc.right)
{
break;
}
Copy link

Copilot AI Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The rc2 rectangle is being reused without resetting it to {0, 0, 0, 0} after the first DrawTextEx call on line 2726. When DrawTextEx is called with DT_CALCRECT, it modifies the RECT structure. This second call may produce incorrect results because rc2 already contains non-zero values from the first call.

Consider resetting rc2 before the second DrawTextEx call:

rc2 = {0, 0, 0, 0};
DrawTextEx(hdc, pMatch, pInfo->matchLengths[subIndex], &rc2, DT_CALCRECT | DT_NOPREFIX | DT_SINGLELINE, NULL);
Suggested change
}
}
rc2 = {0, 0, 0, 0};

Copilot uses AI. Check for mistakes.
GetTextExtentPoint32(hdc, pMatch, pInfo->matchLengths[subIndex], &textSize);
if (rc.right > rc.left + textSize.cx)
DrawTextEx(hdc, pMatch, pInfo->matchLengths[subIndex], &rc2, DT_CALCRECT | DT_NOPREFIX | DT_SINGLELINE, NULL);
width = rc2.right - rc2.left;
if (rc.right > rc.left + width)
{
rc.right = rc.left + textSize.cx;
rc.right = rc.left + width;
}

LONG width = rc.right - rc.left;
width = rc.right - rc.left;
LONG height = rc.bottom - rc.top;
HDC hcdc = CreateCompatibleDC(hdc);
BITMAPINFO bmi = {{sizeof(BITMAPINFOHEADER), width, height, 1, 32, BI_RGB, static_cast<DWORD>(width * height * 4u), 0, 0, 0, 0}, {{0, 0, 0, 0}}};
BLENDFUNCTION blend = {AC_SRC_OVER, 0, 92, 0}; // 36%
HBITMAP hBitmap = CreateDIBSection(hcdc, &bmi, DIB_RGB_COLORS, nullptr, nullptr, 0x0);
RECT rc2 = {0, 0, width, height};
auto oldBmp = SelectObject(hcdc, hBitmap);
auto brush = CreateSolidBrush(RGB(255, 255, 0));
rc2 = {0, 0, width, height};
FillRect(hcdc, &rc2, brush);
AlphaBlend(hdc, rc.left, rc.top, width, height, hcdc, 0, 0, width, height, blend);
SelectObject(hcdc, oldBmp);
Expand Down