Explorar o código

Fix Esc autocomplete (and calltip) cancel.

Martijn Laan hai 1 ano
pai
achega
c61bb2f3c2
Modificáronse 1 ficheiros con 2 adicións e 1 borrados
  1. 2 1
      Projects/Src/CompForm.pas

+ 2 - 1
Projects/Src/CompForm.pas

@@ -1286,7 +1286,8 @@ begin
     if not FKeyMappedMenus.ContainsKey(AShortCut) then begin
     if not FKeyMappedMenus.ContainsKey(AShortCut) then begin
       var ComplexCommand := FActiveMemo.GetComplexCommand(AShortCut);
       var ComplexCommand := FActiveMemo.GetComplexCommand(AShortCut);
       if ComplexCommand <> ccNone then begin
       if ComplexCommand <> ccNone then begin
-        Key := 0;
+        if Key <> VK_ESCAPE then { Allow Scintilla to see Esc }
+          Key := 0;
         case ComplexCommand of
         case ComplexCommand of
           ccSelectNextOccurrence:
           ccSelectNextOccurrence:
             ESelectNextOccurrenceClick(Self);
             ESelectNextOccurrenceClick(Self);