Replace STYLE_AUTOCOMPLETION and SCI_AUTOCUSESTYLE with SCI_AUTOCSETS…

…TYLEOFFSET (and SCI_AUTOCGETSTYLEOFFSET).
jrsoftware · Jun 22, 2024 · 9872717 · 9872717
1 parent f80f1db
commit 9872717
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/Components/ScintEdit.pas b/Components/ScintEdit.pas
@@ -94,6 +94,7 @@   TScintEdit = class(TWinControl)
     FAcceptDroppedFiles: Boolean;
     FAutoCompleteFontName: String;
     FAutoCompleteFontSize: Integer;
+    FAutoCompleteStyleOffset: Integer;
     FChangeHistory: TScintChangeHistory;
     FCodePage: Integer;
     FDirectPtr: Pointer;
@@ -2140,15 +2141,21 @@ procedure TScintEdit.UpdateStyleAttributes;
     SetStyleAttrFromStyler(STYLE_LINENUMBER);
   end;
 
-  if AutoCompleteFontName <> '' then
-    DefaultAttr.FontName := AutoCompleteFontName;
-  if AutoCompleteFontSize > 0 then
+  if (AutoCompleteFontName <> '') or (AutoCompleteFontSize > 0) then begin
+    if AutoCompleteFontName <> '' then
+      DefaultAttr.FontName := AutoCompleteFontName;
+    if AutoCompleteFontSize > 0 then
     DefaultAttr.FontSize := AutoCompleteFontSize;
-  DefaultAttr.FontStyle := [];
-  { Note: Scintilla doesn't actually use the colors set here }
-  DefaultAttr.ForeColor := clWindowText;
-  DefaultAttr.BackColor := clWindow;
-  SetStyleAttr(STYLE_AUTOCOMPLETION, DefaultAttr, True);
+    DefaultAttr.FontStyle := [];
+    { Note: Scintilla doesn't actually use the colors set here }
+    DefaultAttr.ForeColor := clWindowText;
+    DefaultAttr.BackColor := clWindow;
+    if FAutoCompleteStyleOffset = 0 then
+      FAutoCompleteStyleOffset := Call(SCI_ALLOCATEEXTENDEDSTYLES, 1, 0);
+    SetStyleAttr(STYLE_DEFAULT + FAutoCompleteStyleOffset, DefaultAttr, True);
+    Call(SCI_AUTOCSETSTYLEOFFSET, FAutoCompleteStyleOffset, 0);
+  end else
+    Call(SCI_AUTOCSETSTYLEOFFSET, 0, 0);
 end;
 
 function TScintEdit.WordAtCursor: String;

diff --git a/Files/isscint.dll b/Files/isscint.dll
diff --git a/Projects/Src/CompScintEdit.pas b/Projects/Src/CompScintEdit.pas
@@ -181,7 +181,6 @@ procedure TCompScintEdit.CreateWnd;
   Call(SCI_AUTOCSETIGNORECASE, 1, 0);
   Call(SCI_AUTOCSETMAXHEIGHT, 12, 0);
   Call(SCI_AUTOCSETMULTI, SC_MULTIAUTOC_EACH, 0);
-  Call(SCI_AUTOCUSESTYLE, 0, 0);
 
   Call(SCI_SETMULTIPLESELECTION, 1, 0);
   Call(SCI_SETADDITIONALSELECTIONTYPING, 1, 0);

diff --git a/Projects/Src/IsscintInt.pas b/Projects/Src/IsscintInt.pas
@@ -13,10 +13,9 @@ interface
 
 const
   SC_MARK_BACKFORE = 34;
-  STYLE_AUTOCOMPLETION = 40;
-  STYLE_LASTPREDEFINED = 40;
   SCI_CUTALLOWLINE = 2805;
-  SCI_AUTOCUSESTYLE = 2806;
+  SCI_AUTOCSETSTYLEOFFSET = 2806;
+  SCI_AUTOGSETSTYLEOFFSET = 2807;
   SC_MASK_HISTORY = $01E00000;
 
 implementation