diff options
author | nyamatongwe <nyamatongwe@gmail.com> | 2013-03-16 21:00:54 +1100 |
---|---|---|
committer | nyamatongwe <nyamatongwe@gmail.com> | 2013-03-16 21:00:54 +1100 |
commit | d54e3a3ac23da0b6fce2c7fa55cbe22a05cc2aef (patch) | |
tree | 46e5fb08fc39f1b1fd131d0b9ccd3a0af4a10cac | |
parent | 9a54a91010faad3a593889088eb774b9cde8af5f (diff) | |
download | scintilla-mirror-d54e3a3ac23da0b6fce2c7fa55cbe22a05cc2aef.tar.gz |
Fix margin drawing with Cocoa when always-visible scrollbars turned on.
-rw-r--r-- | src/Editor.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Editor.cxx b/src/Editor.cxx index e79d8383a..f63ceda43 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -1819,6 +1819,8 @@ void Editor::PaintSelMargin(Surface *surfWindow, PRectangle &rc) { PRectangle rcSelMargin = rcMargin; rcSelMargin.right = rcMargin.left; + if (rcSelMargin.bottom < rc.bottom) + rcSelMargin.bottom = rc.bottom; for (int margin = 0; margin <= SC_MAX_MARGIN; margin++) { if (vs.ms[margin].width > 0) { @@ -1886,7 +1888,7 @@ void Editor::PaintSelMargin(Surface *surfWindow, PRectangle &rc) { int folderEnd = SubstituteMarkerIfEmpty(SC_MARKNUM_FOLDEREND, SC_MARKNUM_FOLDER); - while ((visibleLine < cs.LinesDisplayed()) && yposScreen < rcMargin.bottom) { + while ((visibleLine < cs.LinesDisplayed()) && yposScreen < rc.bottom) { PLATFORM_ASSERT(visibleLine < cs.LinesDisplayed()); int lineDoc = cs.DocFromDisplay(visibleLine); |