From 0489cac94d6ec14b3610ac7147e348a1e2a0ebda Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Thu, 12 Apr 2018 19:24:50 +0200 Subject: [PATCH] ui: Fixed carriage return in line endings breaks screen search in code --- src/lib_gui/qt/element/QtCodeArea.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib_gui/qt/element/QtCodeArea.cpp b/src/lib_gui/qt/element/QtCodeArea.cpp index de942823..ba16ac8c 100644 --- a/src/lib_gui/qt/element/QtCodeArea.cpp +++ b/src/lib_gui/qt/element/QtCodeArea.cpp @@ -418,7 +418,8 @@ QRectF QtCodeArea::getLineRectForLineNumber(uint lineNumber) const void QtCodeArea::findScreenMatches(const std::wstring& query, std::vector>* screenMatches) { TextCodec codec(ApplicationSettings::getInstance()->getTextEncoding()); - const std::wstring& code = utility::toLowerCase(codec.decode(getCode())); + // remove carriage return + const std::wstring& code = utility::toLowerCase(codec.decode(utility::replace(getCode(), "\r", ""))); size_t pos = 0; while (pos != std::string::npos) {