haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

scintilla: bump to 4.1.3

Browse Source
This commit is contained in:
Kacper Kasper
2019-01-30 18:21:13 +01:00
parent f58e9f7a7e
commit ed7c997da0
2 changed files with 80 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
x11-libs/scintilla/patches/scintilla-4.1.3.patchset Normal file
View File

@@ -0,0 +1,75 @@
From 206eec847c17c61dcaa069da43612a5d8ad0e1ef Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Wed, 30 Jan 2019 18:17:11 +0100
Subject: Apply changes made after the release
* Fixes scroll bars and autoscroll.
diff --git a/haiku/ScintillaHaiku.cxx b/haiku/ScintillaHaiku.cxx
index 74ca95b..13c83c4 100644
--- a/haiku/ScintillaHaiku.cxx
+++ b/haiku/ScintillaHaiku.cxx
@@ -172,7 +172,6 @@ void CallTipView::Draw(BRect updateRect) {
class ScintillaHaiku : public ScintillaBase, public BView {
public:
- ScintillaHaiku();
ScintillaHaiku(BRect rect);
// functions from Scintilla:
@@ -240,17 +239,8 @@ private:
BScrollView* scrollView;
};
-ScintillaHaiku::ScintillaHaiku():
- BView("ScintillaHaikuView", B_WILL_DRAW | B_FRAME_EVENTS),
- scrollView(NULL)
-{
- capturedMouse = false;
-
- Initialise();
-}
-
ScintillaHaiku::ScintillaHaiku(BRect rect):
- BView(rect, "ScintillaHaikuView", B_FOLLOW_ALL, B_WILL_DRAW | B_FRAME_EVENTS),
+ BView(rect, "ScintillaHaikuView", B_FOLLOW_ALL, B_WILL_DRAW),
scrollView(NULL)
{
capturedMouse = false;
@@ -430,9 +420,12 @@ bool ScintillaHaiku::ModifyScrollBars(Sci::Line nMax, Sci::Line nPage) {
if(ScrollBar(B_HORIZONTAL) != NULL) {
ScrollBar(B_HORIZONTAL)->SetRange(1, horizEndPreferred + 1);
ScrollBar(B_HORIZONTAL)->SetSteps(charWidth, pageIncrement);
+ ScrollBar(B_HORIZONTAL)->SetProportion(0.0);
}
if(ScrollBar(B_VERTICAL) != NULL) {
ScrollBar(B_VERTICAL)->SetRange(1, nMax - pageScroll + 1);
+ ScrollBar(B_VERTICAL)->SetSteps(1.0, pageScroll - 1);
+ ScrollBar(B_VERTICAL)->SetProportion(0.0);
}
UnlockLooper();
return true;
@@ -823,10 +816,9 @@ void ScintillaHaiku::MouseMoved(BPoint point, uint32 transit, const BMessage* me
switch(transit) {
case B_ENTERED_VIEW:
case B_INSIDE_VIEW:
- ButtonMoveWithModifiers(pt, when, mod);
- break;
case B_EXITED_VIEW:
case B_OUTSIDE_VIEW:
+ ButtonMoveWithModifiers(pt, when, mod);
break;
};
}
@@ -923,7 +915,7 @@ BScintillaView::BScintillaView(BRect rect, const char* name, uint32 resizingMode
BScintillaView::BScintillaView(const char* name, uint32 flags, bool horizontal, bool vertical, border_style border):
BScrollView(name, NULL, flags, horizontal, vertical, border) {
p = new BScintillaPrivate;
- p->sciControl = new ScintillaHaiku();
+ p->sciControl = new ScintillaHaiku(Bounds());
SetTarget(p->sciControl);
}
--
2.19.1

9
x11-libs/scintilla/scintilla-4.1.2.recipe → x11-libs/scintilla/scintilla-4.1.3.recipe
View File

@@ -11,14 +11,15 @@ choices are more open than with many editors, allowing the use of \
proportional fonts, bold and italics, multiple foreground and background \
colours and multiple fonts."
HOMEPAGE="https://scintilla.org"
COPYRIGHT="1998-2018 Neil Hodgson"
COPYRIGHT="1998-2019 Neil Hodgson"
LICENSE="Scintilla"
REVISION="2"
REVISION="1"
SOURCE_URI="https://prdownloads.sf.net/scintilla/scintilla${portVersion//\./}.tgz"
CHECKSUM_SHA256="8c54787600fbefa5240ff3c4ac1c84fa186a445091377dde8194a4f1e1471d52"
CHECKSUM_SHA256="5b282b458ac2ff355338e8ba920212c1362e6ab98689fd759240942e2aec4d3c"
SOURCE_DIR="scintilla"
SOURCE_URI_2="https://prdownloads.sf.net/scintilla/scintillahaiku${portVersion//\./}.tgz"
CHECKSUM_SHA256_2="dc846ab45b47dcfa87829babccb50ee3da40301d6de4124ba92417957a5c0bb3"
CHECKSUM_SHA256_2="54a283de8f35a7e9b165db87e0899acd947f37b0add8b1787e354099c14011cc"
PATCHES_2="scintilla-$portVersion.patchset"
srcGitRev3="a70d8f25bcd3b8260f044e2e3db195d884ffb283"
SOURCE_URI_3="https://github.com/KapiX/scintilla-haiku-lexers/archive/$srcGitRev3.tar.gz"
CHECKSUM_SHA256_3="53adbad4a6d9774789d46236418a802c92a15c5e65a4dbc66d3a2ec4a9aa4af4"