Explorar el Código

Update to Scintilla 5.5.7.

Martijn Laan hace 2 meses
padre
commit
b72b7c3841
Se han modificado 4 ficheros con 20 adiciones y 12 borrados
  1. 15 7
      Components/ScintInt.pas
  2. BIN
      Files/isscint.dll
  3. 4 4
      Files/isscint.dll.issig
  4. 1 1
      Projects/Src/IDE.IDEScintEdit.pas

+ 15 - 7
Components/ScintInt.pas

@@ -445,6 +445,8 @@ const
   SCI_AUTOCGETMAXHEIGHT = 2211;
   SCI_AUTOCSETSTYLE = 2109;
   SCI_AUTOCGETSTYLE = 2120;
+  SCI_AUTOCSETIMAGESCALE = 2815;
+  SCI_AUTOCGETIMAGESCALE = 2816;
   SCI_SETINDENT = 2122;
   SCI_GETINDENT = 2123;
   SCI_SETUSETABS = 2124;
@@ -505,6 +507,7 @@ const
   SCI_GETCHANGEHISTORY = 2781;
   SC_UNDO_SELECTION_HISTORY_DISABLED = 0;
   SC_UNDO_SELECTION_HISTORY_ENABLED = 1;
+  SC_UNDO_SELECTION_HISTORY_SCROLL = 2;
   SCI_SETUNDOSELECTIONHISTORY = 2782;
   SCI_GETUNDOSELECTIONHISTORY = 2783;
   SCI_SETSELECTIONSERIALIZED = 2784;
@@ -529,6 +532,7 @@ const
   SCI_LINEFROMPOSITION = 2166;
   SCI_POSITIONFROMLINE = 2167;
   SCI_LINESCROLL = 2168;
+  SCI_SCROLLVERTICAL = 2817;
   SCI_SCROLLCARET = 2169;
   SCI_SCROLLRANGE = 2569;
   SCI_REPLACESEL = 2170;
@@ -1321,16 +1325,20 @@ type
   TSCNotification = record
     nmhdr: TNMHdr;
     position: TSci_Position;    { SCN_STYLENEEDED, SCN_DOUBLECLICK, SCN_MODIFIED, SCN_MARGINCLICK,
-                                  SCN_NEEDSHOWN, SCN_DWELLSTART, SCN_DWELLEND, SCN_CALLTIPCLICK,
+                                  SCN_MARGINRIGHTCLICK, SCN_NEEDSHOWN, SCN_DWELLSTART, SCN_DWELLEND,
+                                  SCN_CALLTIPCLICK,
                                   SCN_HOTSPOTCLICK, SCN_HOTSPOTDOUBLECLICK, SCN_HOTSPOTRELEASECLICK,
                                   SCN_INDICATORCLICK, SCN_INDICATORRELEASE,
-                                  SCN_USERLISTSELECTION, SCN_AUTOCSELECTION }
+                                  SCN_USERLISTSELECTION, SCN_AUTOCCOMPLETED, SCN_AUTOCSELECTION,
+                                  SCN_AUTOCSELECTIONCHANGE }
     ch: Integer;                { SCN_CHARADDED, SCN_KEY, SCN_AUTOCCOMPLETED, SCN_AUTOCSELECTION,
                                   SCN_USERLISTSELECTION }
     modifiers: Integer;         { SCN_KEY, SCN_DOUBLECLICK, SCN_HOTSPOTCLICK, SCN_HOTSPOTDOUBLECLICK,
-                                  SCN_HOTSPOTRELEASECLICK, SCN_INDICATORCLICK, SCN_INDICATORRELEASE,}
+                                  SCN_HOTSPOTRELEASECLICK, SCN_INDICATORCLICK, SCN_INDICATORRELEASE,
+                                  SCN_MARGINCLICK, SCN_MARGINRIGHTCLICK }
     modificationType: Integer;  { SCN_MODIFIED }
-    text: PAnsiChar;            { SCN_MODIFIED, SCN_USERLISTSELECTION, SCN_AUTOCSELECTION, SCN_URIDROPPED }
+    text: PAnsiChar;            { SCN_MODIFIED, SCN_USERLISTSELECTION, SCN_URIDROPPED,
+                                  SCN_AUTOCCOMPLETED, SCN_AUTOCSELECTION, SCN_AUTOCSELECTIONCHANGE }
     length: TSci_Position;      { SCN_MODIFIED }
     linesAdded: TSci_Position;  { SCN_MODIFIED }
     message: Integer;           { SCN_MACRORECORD }
@@ -1339,8 +1347,8 @@ type
     line: TSci_Position;        { SCN_MODIFIED }
     foldLevelNow: Integer;      { SCN_MODIFIED }
     foldLevelPrev: Integer;     { SCN_MODIFIED }
-    margin: Integer;            { SCN_MARGINCLICK }
-    listType: Integer;          { SCN_USERLISTSELECTION }
+    margin: Integer;            { SCN_MARGINCLICK, SCN_MARGINRIGHTCLICK }
+    listType: Integer;          { SCN_USERLISTSELECTION, SCN_AUTOCSELECTIONCHANGE }
     x: Integer;                 { SCN_DWELLSTART, SCN_DWELLEND }
     y: Integer;                 { SCN_DWELLSTART, SCN_DWELLEND }
     token: Integer;             { SCN_MODIFIED with SC_MOD_CONTAINER }
@@ -1369,7 +1377,7 @@ uses
 procedure InitIsscintLibrary;
 begin
   var FileName := AddBackslash(PathExtractPath(ParamStr(0))) + IsscintDLL;
-  IsscintLibrary := LoadTrustedLibrary(PChar(FileName), []);
+  IsscintLibrary := LoadTrustedLibrary(PChar(FileName), [ltloTrustAllOnDebug]);
 end;
 
 end.

BIN
Files/isscint.dll


+ 4 - 4
Files/isscint.dll.issig

@@ -1,6 +1,6 @@
 format issig-v1
-file-size 795776
-file-hash 5ae5dcd47ae9cd0929e0d6b2591e2ecc14cb8dfe4e04fb37a6cef5f1896edd11
+file-size 809616
+file-hash 56582348091d238de6035c1a7c1bb479b5b442580736cd45d4eddd7cdd602656
 key-id def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38
-sig-r dd7de5a0ea422c67375023d74c410973a8508a054d6675710a2e591d7b33abdd
-sig-s 0bd08ccdb7f69a97b3e390a28dfdda98a1cad50f11682567fa03b93c7c5fb285
+sig-r 39aad109b6fba383abe0833416f0b0d7f1f728a6ace65f87927e6e4110123c02
+sig-s 91263cd0eac9bd1a7a1a9225e3bd5052c12fd9021cd0b8608f8c44cbf9b75faa

+ 1 - 1
Projects/Src/IDE.IDEScintEdit.pas

@@ -228,7 +228,7 @@ begin
   Call(SCI_SETADDITIONALSELECTIONTYPING, 1, 0);
   Call(SCI_SETMULTIPASTE, SC_MULTIPASTE_EACH, 0);
   Call(SCI_SETCOPYSEPARATOR, 0, LineEndingString);
-  Call(SCI_SETUNDOSELECTIONHISTORY, 1, 0);
+  Call(SCI_SETUNDOSELECTIONHISTORY, SC_UNDO_SELECTION_HISTORY_ENABLED, 0);
 
   AssignCmdKey('Z', [ssShift, ssCtrl], SCI_REDO);