improve result tip to show match texts left aligned

* `%30s` adds space prefix if the length < 30, remove width specification
* show the match with a prefix context, in case of at a long line end,
  even offset > 259
* in content mode, show content starting from the line pointed to
* increase the max picked length to 50

Author: lifenjoiner

src/Resources/grepWin.rc

@@ -396,7 +396,7 @@ BEGIN
     IDS_COPYRESULT          "Copy text result to clipboard"
     IDS_COPYRESULTS         "Copy text results to clipboard"
     IDS_XMOREMATCHES        "%ld more matches"
-    IDS_CONTEXTLINE         "Line %5ld : %30s\n"
+    IDS_CONTEXTLINE         "Line %5ld : %s\n"
     IDS_INFOLABELFILE       "scanning file '%s'"
     IDS_ERR_RELATIVEPATH    "Relative paths are not allowed. Please enter an absolute path!"
     IDS_ERR_INVALID_PATH    "Invalid path!"

src/SearchDlg.cpp

@@ -2695,37 +2695,51 @@ void CSearchDlg::DoListNotify(LPNMITEMACTIVATE lpNMItemActivate)
     }
     else if (lpNMItemActivate->hdr.code == LVN_GETINFOTIP)
     {
-        NMLVGETINFOTIP* pInfoTip = reinterpret_cast<NMLVGETINFOTIP*>(lpNMItemActivate);
+        NMLVGETINFOTIP* pInfoTip    = reinterpret_cast<NMLVGETINFOTIP*>(lpNMItemActivate);
 
-        // Which item number?
-        size_t          itemId   = pInfoTip->iItem;
-        int             iItem    = GetSelectedListIndex(static_cast<int>(itemId));
-        pInfoTip->pszText[0]     = 0;
-        if (static_cast<int>(m_items.size()) > iItem)
+        size_t          listIndex   = pInfoTip->iItem;
+        auto            tup         = m_listItems[listIndex];
+        int             iItem       = std::get<0>(tup);
+        CSearchInfo&    inf         = m_items[iItem];
+        int             subIndex    = 0;
+
+        bool fileList = (IsDlgButtonChecked(*this, IDC_RESULTFILES) == BST_CHECKED);
+
+        if (!fileList)
         {
-            CSearchInfo& inf         = m_items[iItem];
+            subIndex = std::get<1>(tup);
+        }
 
-            std::wstring matchString = inf.filePath + L"\n";
-            if (!inf.exception.empty())
-            {
-                matchString += inf.exception;
-                matchString += L"\n";
-            }
-            std::wstring sFormat = TranslatedString(hResource, IDS_CONTEXTLINE);
-            for (size_t i = 0; i < min(inf.matchLines.size(), 5); ++i)
-            {
-                std::wstring matchText = inf.matchLines[i];
-                CStringUtils::trim(matchText);
-                matchString += CStringUtils::Format(sFormat.c_str(), inf.matchLinesNumbers[i], matchText.c_str());
-            }
-            if (inf.matchLines.size() > 5)
+        std::wstring matchString    = inf.filePath + L"\n";
+        if (!inf.exception.empty())
+        {
+            matchString += inf.exception;
+            matchString += L"\n";
+        }
+
+        std::wstring    sFormat     = TranslatedString(hResource, IDS_CONTEXTLINE);
+        int             leftMax     = static_cast<int>(inf.matchLines.size());
+        int             showMax     = min(leftMax, subIndex + 5);
+        for (; subIndex < showMax; ++subIndex)
+        {
+            std::wstring matchText  = inf.matchLines[subIndex];
+            CStringUtils::rtrim(matchText);
+            DWORD   iShow   = 0;
+            if (inf.matchMovesNumbers[subIndex] > 8)
             {
-                std::wstring sx  = TranslatedString(hResource, IDS_XMOREMATCHES);
-                std::wstring ssx = CStringUtils::Format(sx.c_str(), static_cast<int>(inf.matchLines.size() - 5));
-                matchString += ssx;
+                // 6 + 1 prefix chars would give a context
+                iShow = inf.matchMovesNumbers[subIndex] - 8;
             }
-            wcsncpy_s(pInfoTip->pszText, pInfoTip->cchTextMax, matchString.c_str(), pInfoTip->cchTextMax - 1LL);
+            matchString += CStringUtils::Format(sFormat.c_str(), inf.matchLinesNumbers[subIndex], matchText.substr(iShow, 50).c_str());
+        }
+        leftMax  -= subIndex;
+        if (leftMax > 0)
+        {
+            std::wstring sx  = TranslatedString(hResource, IDS_XMOREMATCHES);
+            std::wstring ssx = CStringUtils::Format(sx.c_str(), leftMax);
+            matchString += ssx;
         }
+        wcsncpy_s(pInfoTip->pszText, pInfoTip->cchTextMax, matchString.c_str(), pInfoTip->cchTextMax - 1LL);
     }
     else if (lpNMItemActivate->hdr.code == LVN_GETDISPINFO)
     {

translations/Afrikaans.lang

@@ -311,8 +311,8 @@ msgstr "Lyn"
 
 #. Resource IDs: (150)
 #, c-format
-msgid "Line %5ld : %30s\n"
-msgstr "Lyn %5ld : %30s\n"
+msgid "Line %5ld : %s\n"
+msgstr "Lyn %5ld : %s\n"
 
 #. Resource IDs: (135)
 msgid "Matches"

translations/Belarusian.lang

@@ -311,8 +311,8 @@ msgstr "Радок"
 
 #. Resource IDs: (150)
 #, c-format
-msgid "Line %5ld : %30s\n"
-msgstr "Радок %5ld : %30s\n"
+msgid "Line %5ld : %s\n"
+msgstr "Радок %5ld : %s\n"
 
 #. Resource IDs: (135)
 msgid "Matches"

translations/Chinese Simplified.lang

@@ -311,8 +311,8 @@ msgstr "行号"
 
 #. Resource IDs: (150)
 #, c-format
-msgid "Line %5ld : %30s\n"
-msgstr "行 %5ld : %30s\n"
+msgid "Line %5ld : %s\n"
+msgstr "行 %5ld : %s\n"
 
 #. Resource IDs: (135)
 msgid "Matches"

translations/Chinese Traditional.lang

@@ -311,8 +311,8 @@ msgstr "行號"
 
 #. Resource IDs: (150)
 #, c-format
-msgid "Line %5ld : %30s\n"
-msgstr "行 %5ld : %30s\n"
+msgid "Line %5ld : %s\n"
+msgstr "行 %5ld : %s\n"
 
 #. Resource IDs: (135)
 msgid "Matches"

translations/Dutch.lang

@@ -311,8 +311,8 @@ msgstr "Regel"
 
 #. Resource IDs: (150)
 #, c-format
-msgid "Line %5ld : %30s\n"
-msgstr "Regel %5ld : %30s\n"
+msgid "Line %5ld : %s\n"
+msgstr "Regel %5ld : %s\n"
 
 #. Resource IDs: (135)
 msgid "Matches"

translations/English.lang

@@ -311,7 +311,7 @@ msgstr ""
 
 #. Resource IDs: (150)
 #, c-format
-msgid "Line %5ld : %30s\n"
+msgid "Line %5ld : %s\n"
 msgstr ""
 
 #. Resource IDs: (135)

translations/French.lang

@@ -311,8 +311,8 @@ msgstr "Ligne"
 
 #. Resource IDs: (150)
 #, c-format
-msgid "Line %5ld : %30s\n"
-msgstr "Ligne %5ld : %30s\n"
+msgid "Line %5ld : %s\n"
+msgstr "Ligne %5ld : %s\n"
 
 #. Resource IDs: (135)
 msgid "Matches"

translations/German.lang

@@ -311,8 +311,8 @@ msgstr "Zeile"
 
 #. Resource IDs: (150)
 #, c-format
-msgid "Line %5ld : %30s\n"
-msgstr "Zeile %5ld : %30s\n"
+msgid "Line %5ld : %s\n"
+msgstr "Zeile %5ld : %s\n"
 
 #. Resource IDs: (135)
 msgid "Matches"