diff options
author | Neil <nyamatongwe@gmail.com> | 2019-07-02 07:59:04 +1000 |
---|---|---|
committer | Neil <nyamatongwe@gmail.com> | 2019-07-02 07:59:04 +1000 |
commit | f23fa56d86fa3af91198c93647883522bcdefe4c (patch) | |
tree | e0280d83fdde7bbdb4b56ccda69ead0017453885 | |
parent | b94f79361fc0ab33e375743cd2f47e4c6e3796d4 (diff) | |
download | scintilla-mirror-f23fa56d86fa3af91198c93647883522bcdefe4c.tar.gz |
Backport: Bug [#2115]. Backed out changeset: 74b2c724a1df as not undefined behaviour.
Backport of changeset 7617:a8a6cd857728.
-rw-r--r-- | src/MarginView.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/MarginView.cxx b/src/MarginView.cxx index a9a5cdb7e..e6f73c52a 100644 --- a/src/MarginView.cxx +++ b/src/MarginView.cxx @@ -267,7 +267,7 @@ void MarginView::PaintMargin(Surface *surface, Sci::Line topLine, PRectangle rc, const bool firstSubLine = visibleLine == firstVisibleLine; const bool lastSubLine = visibleLine == lastVisibleLine; - unsigned int marks = model.pdoc->GetMark(lineDoc); + int marks = model.pdoc->GetMark(lineDoc); if (!firstSubLine) marks = 0; @@ -284,7 +284,7 @@ void MarginView::PaintMargin(Surface *surface, Sci::Line topLine, PRectangle rc, if (levelNum < levelNextNum) { if (model.pcs->GetExpanded(lineDoc)) { if (levelNum == SC_FOLDLEVELBASE) - marks |= 1U << SC_MARKNUM_FOLDEROPEN; + marks |= 1 << SC_MARKNUM_FOLDEROPEN; else marks |= 1 << folderOpenMid; } else { |