Fixed bug where not styling last document line on screen when followed by

annotation lines.
StyledText class encapsulates related data when drawing annotations and
margins.

1 files changed, 10 insertions, 0 deletions

diff --git a/src/Document.cxx b/src/Document.cxx
index 2c9ac34a9..b0070233f 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -1285,6 +1285,11 @@ const char *Document::MarginStyles(int line) {
 	return static_cast<LineAnnotation*>(perLineData[ldMargin])->Styles(line); 
 }
 
+StyledText Document::MarginStyledText(int line) {
+	return StyledText(MarginLength(line), MarginText(line), 
+		MarginMultipleStyles(line), MarginStyle(line), MarginStyles(line));
+}
+
 void Document::MarginSetText(int line, const char *text) {
 	static_cast<LineAnnotation*>(perLineData[ldMargin])->SetText(line, text); 
 	DocModification mh(SC_MOD_CHANGEMARGIN, LineStart(line), 0, 0, 0, line);
@@ -1331,6 +1336,11 @@ const char *Document::AnnotationStyles(int line) {
 	return static_cast<LineAnnotation*>(perLineData[ldAnnotation])->Styles(line); 
 }
 
+StyledText Document::AnnotationStyledText(int line) {
+	return StyledText(AnnotationLength(line), AnnotationText(line), 
+		AnnotationMultipleStyles(line), AnnotationStyle(line), AnnotationStyles(line));
+}
+
 void Document::AnnotationSetText(int line, const char *text) {
 	const int linesBefore = AnnotationLines(line);
 	static_cast<LineAnnotation*>(perLineData[ldAnnotation])->SetText(line, text);