Merge branch 'master' into foldercomp-diffalgo

WinMerge · Sep 6, 2023 · ca878d4 · ca878d4
2 parents f7a0f56 + 50f3edb
commit ca878d4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Externals/crystaledit/editlib/ccrystaltextview.cpp b/Externals/crystaledit/editlib/ccrystaltextview.cpp
@@ -2491,7 +2491,8 @@ GetTopMarginText (const CRect& rect, CString& text, std::vector<int>& nWidths)
     {
       int nColumnWidth = m_pTextBuffer->GetColumnWidth (nColumn);
       CString columnName;
-      if (m_nTopSubLine > 0 && m_nLineNumberUsedAsHeaders >= 0 && m_nLineNumberUsedAsHeaders < m_pTextBuffer->GetLineCount())
+      if (m_nLineNumberUsedAsHeaders >= 0 && m_nLineNumberUsedAsHeaders < m_pTextBuffer->GetLineCount() && 
+          (m_nTopSubLine > 0 || (m_pTextBuffer->GetLineFlags(m_nLineNumberUsedAsHeaders) & LF_INVISIBLE)))
         columnName = replaceControlChars (m_pTextBuffer->GetCellText (m_nLineNumberUsedAsHeaders, nColumn).c_str ()); // Use std::basic_string<tchar_t> instead of CString
       if (columnName.IsEmpty())
         columnName = GetColumnName (nColumn);