From 63fcc3edaf7ca501fdf7d6d98bb0a5de24939f71 Mon Sep 17 00:00:00 2001
From: Zufu Liu <unknown>
Date: Thu, 19 Mar 2020 08:53:15 +1100
Subject: Backport: Feature [feature-requests:1302] Add IsCaretVisible to
 simplify DrawCarets.

Backport of changeset 8010:4b365fa302a2.
---
 src/EditView.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/EditView.cxx')

diff --git a/src/EditView.cxx b/src/EditView.cxx
index 9418cf597..f2b4e6c03 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -1353,7 +1353,7 @@ void EditView::DrawCarets(Surface *surface, const EditModel &model, const ViewSt
 			}
 			const bool caretBlinkState = (model.caret.active && model.caret.on) || (!additionalCaretsBlink && !mainCaret);
 			const bool caretVisibleState = additionalCaretsVisible || mainCaret;
-			if ((xposCaret >= 0) && (vsDraw.caretWidth > 0) && (vsDraw.caretStyle != CARETSTYLE_INVISIBLE) &&
+			if ((xposCaret >= 0) && vsDraw.IsCaretVisible() &&
 				(drawDrag || (caretBlinkState && caretVisibleState))) {
 				bool caretAtEOF = false;
 				bool caretAtEOL = false;
-- 
cgit v1.2.3