diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2018-02-18 12:14:04 -0500 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2018-02-18 12:14:04 -0500 |
| commit | 02388f3a7a6dfc1c8d22b11a7a22527a50cabcce (patch) | |
| tree | 9a3a58003af5eb129352d1d3fbc2965d08a98953 /src/scintilla_backports/6327_95346e626cf8.patch | |
| parent | 35fce59f65c02414af6cf0fcdc698c61ae0f8b47 (diff) | |
| download | textadept-02388f3a7a6dfc1c8d22b11a7a22527a50cabcce.tar.gz textadept-02388f3a7a6dfc1c8d22b11a7a22527a50cabcce.zip | |
Backported some previous Scintilla 4.0.0 changes that broke Scinterm.
Requires Scinterm r167 (changeset a0a536a4fe7e).
Diffstat (limited to 'src/scintilla_backports/6327_95346e626cf8.patch')
| -rw-r--r-- | src/scintilla_backports/6327_95346e626cf8.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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<Sci::Position>( + 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<Sci::Position>( + pdoc->LineEnd(cs.DocFromDisplay(lineDisplay)))); @@ -1684,8 +1684,8 @@ diff -r c15f84c11e17 -r 95346e626cf8 src/Editor.cxx return pdoc->MovePositionOutsideChar(static_cast<int>(wParam) + 1, 1, true); case SCI_POSITIONRELATIVE: -- return Platform::Clamp(pdoc->GetRelativePosition(static_cast<int>(wParam), static_cast<int>(lParam)), 0, pdoc->Length()); -+ return Platform::Clamp(static_cast<int>(pdoc->GetRelativePosition(static_cast<int>(wParam), static_cast<int>(lParam))), +- return Sci::Clamp(pdoc->GetRelativePosition(static_cast<int>(wParam), static_cast<int>(lParam)), 0, pdoc->Length()); ++ return Sci::Clamp(static_cast<int>(pdoc->GetRelativePosition(static_cast<int>(wParam), static_cast<int>(lParam))), + 0, static_cast<int>(pdoc->Length())); case SCI_LINESCROLL: |