From 02388f3a7a6dfc1c8d22b11a7a22527a50cabcce Mon Sep 17 00:00:00 2001 From: mitchell <70453897+667e-11@users.noreply.github.com> Date: Sun, 18 Feb 2018 12:14:04 -0500 Subject: Backported some previous Scintilla 4.0.0 changes that broke Scinterm. Requires Scinterm r167 (changeset a0a536a4fe7e). --- src/scintilla_backports/6327_95346e626cf8.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/scintilla_backports/6327_95346e626cf8.patch') diff --git a/src/scintilla_backports/6327_95346e626cf8.patch b/src/scintilla_backports/6327_95346e626cf8.patch index 608b9b80..2bbd03e4 100644 --- a/src/scintilla_backports/6327_95346e626cf8.patch +++ b/src/scintilla_backports/6327_95346e626cf8.patch @@ -989,12 +989,12 @@ diff -r c15f84c11e17 -r 95346e626cf8 src/Editor.cxx @@ -892,10 +902,12 @@ if (moveDir > 0) { // lineDisplay is already line before fold as lines in fold use display line of line after fold - lineDisplay = Platform::Clamp(lineDisplay, 0, cs.LinesDisplayed()); + lineDisplay = Sci::Clamp(lineDisplay, 0, cs.LinesDisplayed()); - return SelectionPosition(pdoc->LineStart(cs.DocFromDisplay(lineDisplay))); + return SelectionPosition(static_cast( + pdoc->LineStart(cs.DocFromDisplay(lineDisplay)))); } else { - lineDisplay = Platform::Clamp(lineDisplay - 1, 0, cs.LinesDisplayed()); + lineDisplay = Sci::Clamp(lineDisplay - 1, 0, cs.LinesDisplayed()); - return SelectionPosition(pdoc->LineEnd(cs.DocFromDisplay(lineDisplay))); + return SelectionPosition(static_cast( + pdoc->LineEnd(cs.DocFromDisplay(lineDisplay)))); @@ -1684,8 +1684,8 @@ diff -r c15f84c11e17 -r 95346e626cf8 src/Editor.cxx return pdoc->MovePositionOutsideChar(static_cast(wParam) + 1, 1, true); case SCI_POSITIONRELATIVE: -- return Platform::Clamp(pdoc->GetRelativePosition(static_cast(wParam), static_cast(lParam)), 0, pdoc->Length()); -+ return Platform::Clamp(static_cast(pdoc->GetRelativePosition(static_cast(wParam), static_cast(lParam))), +- return Sci::Clamp(pdoc->GetRelativePosition(static_cast(wParam), static_cast(lParam)), 0, pdoc->Length()); ++ return Sci::Clamp(static_cast(pdoc->GetRelativePosition(static_cast(wParam), static_cast(lParam))), + 0, static_cast(pdoc->Length())); case SCI_LINESCROLL: -- cgit v1.2.3