blob: f2d7935d44dac3ac43b2f2d23a9000b956553367 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
diff -r 5693714a8b0b src/Catalogue.cxx
--- a/src/Catalogue.cxx Fri Dec 06 16:19:52 2013 +1100
+++ b/src/Catalogue.cxx Sun Dec 15 21:21:20 2013 -0500
@@ -74,6 +74,7 @@
// Shorten the code that declares a lexer and ensures it is linked in by calling a method.
#define LINK_LEXER(lexer) extern LexerModule lexer; Catalogue::AddLexerModule(&lexer);
+#if 0
//++Autogenerated -- run scripts/LexGen.py to regenerate
//**\(\tLINK_LEXER(\*);\n\)
LINK_LEXER(lmA68k);
@@ -187,6 +188,8 @@
LINK_LEXER(lmYAML);
//--Autogenerated -- end of automatically generated section
+#endif
+ LINK_LEXER(lmLPeg);
return 1;
}
diff -r 326449de45d0 src/ScintillaBase.cxx
--- a/src/ScintillaBase.cxx Thu Sep 25 09:48:50 2014 +1000
+++ b/src/ScintillaBase.cxx Sun Nov 30 23:25:36 2014 -0500
@@ -448,12 +448,12 @@
PRectangle rcClient = GetClientRectangle();
int offset = vs.lineHeight + static_cast<int>(rc.Height());
// adjust so it displays above the text.
- if (rc.bottom > rcClient.bottom) {
+ if (rc.bottom > rcClient.bottom && rc.Height() < rcClient.Height()) {
rc.top -= offset;
rc.bottom -= offset;
}
// adjust so it displays below the text.
- if (rc.top < rcClient.top) {
+ if (rc.top < rcClient.top && rc.Height() < rcClient.Height()) {
rc.top += offset;
rc.bottom += offset;
}
diff -r a797ff255bdf src/Editor.cxx
--- a/src/Editor.cxx Sat Nov 29 12:42:58 2014 +1100
+++ b/src/Editor.cxx Wed Dec 17 09:54:10 2014 -0500
@@ -3998,7 +3998,7 @@
// Really means: "Point in a margin"
if (vs.fixedColumnWidth > 0) { // There is a margin
PRectangle rcSelMargin = GetClientRectangle();
- rcSelMargin.right = static_cast<XYPOSITION>(vs.textStart - vs.leftMarginWidth);
+ rcSelMargin.right = static_cast<XYPOSITION>(vs.textStart - (vs.leftMarginWidth > 0 ? vs.leftMarginWidth : 1));
rcSelMargin.left = static_cast<XYPOSITION>(vs.textStart - vs.fixedColumnWidth);
return rcSelMargin.Contains(pt);
} else {
|
