From eefbc33a98c77976b8d8376fffee0f349360de19 Mon Sep 17 00:00:00 2001 From: Zufu Liu Date: Sat, 11 Jul 2020 12:33:24 +1000 Subject: Treat DEL as a control character for determining block caret size. Moved IsControlCharacter to anonymous namespace. --- src/EditView.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/EditView.cxx') diff --git a/src/EditView.cxx b/src/EditView.cxx index 290106a49..82e64ce16 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -59,11 +59,6 @@ using namespace Scintilla; -static constexpr bool IsControlCharacter(int ch) noexcept { - // iscntrl returns true for lots of chars > 127 which are displayable - return ch >= 0 && ch < ' '; -} - PrintParameters::PrintParameters() noexcept { magnification = 0; colourMode = SC_PRINT_NORMAL; @@ -369,6 +364,12 @@ inline char CaseForce(Style::ecaseForced caseForce, char chDoc, char chPrevious) } } +constexpr bool IsControlCharacter(int ch) noexcept { + // iscntrl returns true for lots of chars > 127 which are displayable, + // currently only check C0 control characters. + return (ch >= 0 && ch < ' ') || (ch == 127); +} + } /** -- cgit v1.2.3