restore semi old version of clearindicators

Author: Eugen Kremer

editor/view/IndicatorPanel.cpp

@@ -92,10 +92,21 @@ void IndicatorPanel::OnUpdateLines()
 	}
 }
 
-void IndicatorPanel::EraseIndicatorLines(int begin, int end)
+void IndicatorPanel::ClearIndicators(int begin, int end)
 {
-	auto beginViewPos = m_View.sci(SCI_VISIBLEFROMDOCLINE, begin, 0);
-	auto endViewPos = m_View.sci(SCI_VISIBLEFROMDOCLINE, end, 0);
+	if (m_Indicators.empty())
+		return;
+
+	// document line
+	unsigned int beginLine = (begin <= 0) ? 0 : m_View.sci(SCI_LINEFROMPOSITION, begin, 0);
+	unsigned int endLine = (end < 0) ? m_View.sci(SCI_GETLINECOUNT, 0, 0) : m_View.sci(SCI_LINEFROMPOSITION, end, 0);
+
+	// view line
+	auto beginViewPos = m_View.sci(SCI_VISIBLEFROMDOCLINE, beginLine, 0);
+	auto endViewPos = m_View.sci(SCI_VISIBLEFROMDOCLINE, endLine, 0);
+
+	if (end < 0)
+		endViewPos = max(endViewPos, m_Indicators.rbegin()->first);
 
 	m_Indicators.erase(
 		m_Indicators.emplace(beginViewPos, 0).first,
@@ -107,14 +118,14 @@ bool IndicatorPanel::GetIndicatorLines() {
 
 	auto stopTime = GetTickCount64() + 200; // 200ms
 
+	ClearIndicators(m_Begin, m_End);
+
 	if (m_Begin < 0)
 		m_Begin = 0;
 
 	if (m_End < 0)
 		m_End = m_View.sci(SCI_GETLENGTH, 0, 0);
 
-	EraseIndicatorLines(m_Begin, m_End);
-
 	auto line = m_View.sci(SCI_LINEFROMPOSITION, m_Begin, 0);
 	auto lineEnd = m_View.sci(SCI_GETLINEENDPOSITION, line, 0);
 	auto nextSavePosition = min(lineEnd, m_End - 1);

editor/view/IndicatorPanel.h

@@ -63,7 +63,7 @@ class IndicatorPanel
 	void OnUpdatePixels();
 	void OnUpdateLines();
 
-	void EraseIndicatorLines(int begin, int end);
+	void ClearIndicators(int begin, int end);
 	bool GetIndicatorLines();
 	void GetIndicatorPixels();
 

jN.vcxproj

@@ -26,6 +26,7 @@
     <VersionMinor>0</VersionMinor>
     <BuildNumber>0</BuildNumber>
     <VersionRevision>0</VersionRevision>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
@@ -41,7 +42,7 @@
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PlatformToolset>v142</PlatformToolset>