From 2c8b10513440fc66c831cfa8bda7f5b2c1f0b1ad Mon Sep 17 00:00:00 2001
From: "METANEOCORTEX\\Kotti" <rainer.kottenhoff@gmail.com>
Date: Mon, 19 Jun 2023 12:06:24 +0200
Subject: [PATCH] +chg: Tooltip/Calltip style using Segoe UI font

---
 scintilla/oniguruma/.gitignore    |  1 +
 scintilla/oniguruma/src/regcomp.c |  5 +++--
 src/SciCall.h                     |  4 +++-
 src/Styles.c                      | 11 ++++++++---
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/scintilla/oniguruma/.gitignore b/scintilla/oniguruma/.gitignore
index 825c1351a..27c8d602f 100644
--- a/scintilla/oniguruma/.gitignore
+++ b/scintilla/oniguruma/.gitignore
@@ -18,6 +18,7 @@ Makefile.in
 *.la
 *.pc
 *.log
+*.trs
 *.dll
 *.lib
 *.exe
diff --git a/scintilla/oniguruma/src/regcomp.c b/scintilla/oniguruma/src/regcomp.c
index b8e5a4231..cc593322d 100644
--- a/scintilla/oniguruma/src/regcomp.c
+++ b/scintilla/oniguruma/src/regcomp.c
@@ -2,7 +2,7 @@
   regcomp.c -  Oniguruma (regular expression library)
 **********************************************************************/
 /*-
- * Copyright (c) 2002-2022  K.Kosako
+ * Copyright (c) 2002-2023  K.Kosako
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -3290,9 +3290,10 @@ get_tree_head_literal(Node* node, int exact, regex_t* reg)
       case BAG_OPTION:
       case BAG_MEMORY:
       case BAG_STOP_BACKTRACK:
-      case BAG_IF_ELSE:
         n = get_tree_head_literal(ND_BODY(node), exact, reg);
         break;
+      default:
+        break;
       }
     }
     break;
diff --git a/src/SciCall.h b/src/SciCall.h
index 1753348d2..11d240b6f 100644
--- a/src/SciCall.h
+++ b/src/SciCall.h
@@ -474,6 +474,7 @@ DeclareSciCallV2(CallTipShow, CALLTIPSHOW, DocPos, position, const char*, text);
 DeclareSciCallV2(CallTipSetHlt, CALLTIPSETHLT, int, beg, int, end);
 DeclareSciCallR0(CallTipActive, CALLTIPACTIVE, bool);
 DeclareSciCallV0(CallTipCancel, CALLTIPCANCEL);
+DeclareSciCallV1(CallTipUseStyle, CALLTIPUSESTYLE, int, tabsize);
 DeclareSciCallV1(SetMouseDWellTime, SETMOUSEDWELLTIME, int, millisec);
 
 DeclareSciCallR0(AutoCActive, AUTOCACTIVE, bool);
@@ -584,7 +585,8 @@ DeclareSciCallV1(SetViewEOL, SETVIEWEOL, bool, eols);
 DeclareSciCallR2(StyleGetFont, STYLEGETFONT, int, int, style, char*, fontname);
 DeclareSciCallV2(StyleSetFont, STYLESETFONT, int, style, const char*, fontname);
 DeclareSciCallV2(StyleSetWeight, STYLESETWEIGHT, int, style, int, weight);
-DeclareSciCallV2(StyleSetItalic, STYLESETITALIC, int, style, bool, oblique);
+DeclareSciCallV2(StyleSetBold, STYLESETBOLD, int, style, bool, bold);
+DeclareSciCallV2(StyleSetItalic, STYLESETITALIC, int, style, bool, italic);
 DeclareSciCallV1(SetFontQuality, SETFONTQUALITY, int, qual);
 DeclareSciCallV01(SetFontLocale, SETFONTLOCALE, const char*, localeName);
 
diff --git a/src/Styles.c b/src/Styles.c
index 12f7d51af..079e01d6d 100644
--- a/src/Styles.c
+++ b/src/Styles.c
@@ -2173,11 +2173,16 @@ void Style_SetMargin(HWND hwnd, LPCWSTR lpszStyle) /// iStyle == STYLE_LINENUMBE
 
 
     // ---  CallTips  ---
-    SciCall_CallTipSetBack(clrMarginBack);
-    SciCall_CallTipSetFore(RGB(0x80, 0x80, 0x80));
+    //SciCall_CallTipSetFore(RGB(0x80, 0x80, 0x80)); // clrLineNumFore
+    //SciCall_CallTipSetBack(clrMarginBack);
+    SciCall_StyleSetFont(STYLE_CALLTIP, "Segoe UI");
+    SciCall_StyleSetItalic(STYLE_CALLTIP, false);
+    SciCall_StyleSetBold(STYLE_CALLTIP, false);
+    SciCall_StyleSetFore(STYLE_CALLTIP, RGB(0x80, 0x80, 0x80)); // clrLineNumFore
+    SciCall_StyleSetBack(STYLE_CALLTIP, clrMarginBack);
+    SciCall_CallTipUseStyle(24); // tabsize
     SciCall_CallTipSetForeHlt(clrLineNumFore);
 
-
     // ---  Bookmarks  ---
     LPCWSTR const wchBookMarkStyleStrg = GetCurrentStdLexer()->Styles[STY_BOOK_MARK].szValue;