Martijn Laan 1 год назад
Родитель
Сommit
35c7069bdc
3 измененных файлов с 5 добавлено и 14 удалено
  1. BIN
      Files/isscint.dll
  2. 3 0
      Projects/Src/CompForm.pas
  3. 2 14
      Projects/Src/CompScintEdit.pas

BIN
Files/isscint.dll


+ 3 - 0
Projects/Src/CompForm.pas

@@ -1037,6 +1037,9 @@ begin
     if BStopCompile.Enabled then
       BStopCompileClick(Self)
     else begin
+      { The built in Esc (SCI_CANCEL) simply drops all additional selections
+        and does not empty the main selection, It doesn't matter if Esc is
+        pressed once or twice. Implement our own behaviour, same as VSCode. }
       if FActiveMemo.SelectionCount > 1 then
         FActiveMemo.RemoveAdditionalSelections
       else if FActiveMemo.SelNotEmpty then

+ 2 - 14
Projects/Src/CompScintEdit.pas

@@ -139,19 +139,10 @@ begin
   inherited;
 
   { Some notes about future Scintilla versions:
-    -At some point the documentation will say:
-     "The selection can be simplified down to just the main selection by
-     SCI_CANCEL which is normally mapped to the Esc key."
-     Once it does our own VK_ESCAPE handling in TCompileForm.FormKeyDown should be
-     reviewed. Note that our handling does a two phase simplification like VSCode and
-     not a one phase simplification like Notepad++.
     -At some point the documentation will say:
      "The INDICATOR_* values used for dividing up indicators were previously
       INDIC_CONTAINER, INDIC_IME, INDIC_IME_MAX, and INDIC_MAX"
      Once it does replace our use of these INDIC_* with INDICATOR_*.
-    -3.5.3: Investigate: "When the mouse is on the line between margin and text
-            changed to treat as within text." Does this mean isscint's
-            Editor::GetMarginCursor patch is not needed anymore?
     -3.5.7: Use SCI_MULTIPLESELECTADDEACH to implement Ctrl+Shift+L (Select All
             Occurrences) and SCI_MULTIPLESELECTADDNEXT to implement Ctrl+D (Select
             Next Occurrence). If the selection is empty Scintilla will use word
@@ -208,11 +199,8 @@ begin
 
   { Set up the gutter column with line numbers - avoid Scintilla's 'reverse arrow'
     cursor which is not a standard Windows cursor so is just confusing, especially
-    because the line numbers are clickable to select lines. This cursor will also
-    be used at the small extra margin after the final column which also selects
-    lines so setting the normal cursor also avoids a flashing cursor when moving
-    between the editor and the breakpoint column. Note: width of the column is set
-    up by TScintEdit.UpdateLineNumbersWidth. }
+    because the line numbers are clickable to select lines. Note: width of the
+    column is set up by TScintEdit.UpdateLineNumbersWidth. }
   Call(SCI_SETMARGINCURSORN, 0, SC_CURSORARROW);
 
   { Set up the gutter column with breakpoint etc symbols - note: column 0 is the