From 02c6e420d659471c5cbefdb98af9c512a728052f Mon Sep 17 00:00:00 2001
From: Alan Garny <agarny@hellix.com>
Date: Fri, 21 Dec 2018 11:11:51 +1300
Subject: [PATCH] CellML Text viewer: fixed a problem with Unicode characters
 (#1926).

---
 .../editing/CellMLTextView/src/cellmltextviewwidget.cpp        | 3 ++-
 src/plugins/widget/EditorWidget/src/editorwidget.cpp           | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/editing/CellMLTextView/src/cellmltextviewwidget.cpp b/src/plugins/editing/CellMLTextView/src/cellmltextviewwidget.cpp
index 5a58f2e7d6..aa0ec98b08 100644
--- a/src/plugins/editing/CellMLTextView/src/cellmltextviewwidget.cpp
+++ b/src/plugins/editing/CellMLTextView/src/cellmltextviewwidget.cpp
@@ -1199,7 +1199,8 @@ void CellmlTextViewWidget::updateViewer()
 
             forever {
                 if (isComment(fromPosition) || currentStatement[shift].isSpace()) {
-                    ++fromPosition;
+                    fromPosition += QString(currentStatement[shift]).toUtf8().size();
+
                     ++shift;
                 } else {
                     break;
diff --git a/src/plugins/widget/EditorWidget/src/editorwidget.cpp b/src/plugins/widget/EditorWidget/src/editorwidget.cpp
index 8076cff165..8096efabe6 100644
--- a/src/plugins/widget/EditorWidget/src/editorwidget.cpp
+++ b/src/plugins/widget/EditorWidget/src/editorwidget.cpp
@@ -645,7 +645,7 @@ int EditorWidget::styleAt(int pPosition) const
     // Return the style used at the given position
 
     return int(mEditor->SendScintilla(QsciScintilla::SCI_GETSTYLEAT,
-                                      mEditor->text().left(pPosition).toUtf8().length()));
+                                      pPosition));
 }
 
 //==============================================================================