diff options
| author | Neil <nyamatongwe@gmail.com> | 2020-07-28 13:35:50 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2020-07-28 13:35:50 +1000 |
| commit | 720002200bc7113a52073eab8289c830ae35b4a3 (patch) | |
| tree | 55c0871929357dee6ffed5b04860a1593090fc8a /src | |
| parent | 551f029d0a86b0d6dcda6f85447634c396d9c0cc (diff) | |
| download | scintilla-mirror-720002200bc7113a52073eab8289c830ae35b4a3.tar.gz | |
Backport: Fix position of marker symbols for SC_MARGIN_RTEXT which were being moved based
on width of text.
Backport of changeset 8462:1d48cfa70dcd.
Diffstat (limited to 'src')
| -rw-r--r-- | src/MarginView.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/MarginView.cxx b/src/MarginView.cxx index f0a3559f4..a742bdc4b 100644 --- a/src/MarginView.cxx +++ b/src/MarginView.cxx @@ -364,9 +364,11 @@ void MarginView::PaintMargin(Surface *surface, Sci::Line topLine, PRectangle rc, marks &= vs.ms[margin].mask; - PRectangle rcMarker = rcSelMargin; - rcMarker.top = static_cast<XYPOSITION>(yposScreen); - rcMarker.bottom = static_cast<XYPOSITION>(yposScreen + vs.lineHeight); + PRectangle rcMarker( + rcSelMargin.left, + static_cast<XYPOSITION>(yposScreen), + rcSelMargin.right, + static_cast<XYPOSITION>(yposScreen + vs.lineHeight)); if (vs.ms[margin].style == SC_MARGIN_NUMBER) { if (firstSubLine) { std::string sNumber; @@ -412,11 +414,12 @@ void MarginView::PaintMargin(Surface *surface, Sci::Line topLine, PRectangle rc, if (firstSubLine) { surface->FillRectangle(rcMarker, vs.styles[stMargin.StyleAt(0) + vs.marginStyleOffset].back); + PRectangle rcText = rcMarker; if (vs.ms[margin].style == SC_MARGIN_RTEXT) { const int width = WidestLineWidth(surface, vs, vs.marginStyleOffset, stMargin); - rcMarker.left = rcMarker.right - width - 3; + rcText.left = rcText.right - width - 3; } - DrawStyledText(surface, vs, vs.marginStyleOffset, rcMarker, + DrawStyledText(surface, vs, vs.marginStyleOffset, rcText, stMargin, 0, stMargin.length, drawAll); } else { // if we're displaying annotation lines, colour the margin to match the associated document line |