Mercurial Repositories > eric / file diff

--- a/QScintilla/QsciScintillaCompat.py	Sun Apr 07 19:55:21 2019 +0200
+++ b/QScintilla/QsciScintillaCompat.py	Mon Apr 08 19:08:44 2019 +0200
@@ -52,8 +52,12 @@
         IndicatorStyleMax = QsciScintilla.INDIC_DOTBOX
     elif QSCINTILLA_VERSION() < 0x020800:
         IndicatorStyleMax = QsciScintilla.INDIC_SQUIGGLEPIXMAP
+    elif QSCINTILLA_VERSION() < 0x020900:
+        IndicatorStyleMax = QsciScintilla.INDIC_TEXTFORE
+    elif QSCINTILLA_VERSION() < 0x020A00:
+        IndicatorStyleMax = QsciScintilla.INDIC_POINTCHARACTER
     else:
-        IndicatorStyleMax = QsciScintilla.INDIC_COMPOSITIONTHICK
+        IndicatorStyleMax = QsciScintilla.INDIC_GRADIENTCENTRE
     
     def __init__(self, parent=None):
         """
@@ -971,11 +975,15 @@
             QsciScintilla.INDIC_TT, QsciScintilla.INDIC_DIAGONAL,
             QsciScintilla.INDIC_STRIKE, QsciScintilla.INDIC_HIDDEN,
             QsciScintilla.INDIC_BOX, QsciScintilla.INDIC_ROUNDBOX,
-            QsciScintilla.INDIC_STRAIGHTBOX, QsciScintilla.INDIC_DASH,
-            QsciScintilla.INDIC_DOTS, QsciScintilla.INDIC_SQUIGGLELOW,
-            QsciScintilla.INDIC_DOTBOX, QsciScintilla.INDIC_SQUIGGLEPIXMAP,
-            QsciScintilla.INDIC_COMPOSITIONTHICK depending upon QScintilla
-            version)
+            QsciScintilla.INDIC_STRAIGHTBOX, QsciScintilla.INDIC_FULLBOX,
+            QsciScintilla.INDIC_DASH, QsciScintilla.INDIC_DOTS,
+            QsciScintilla.INDIC_SQUIGGLELOW, QsciScintilla.INDIC_DOTBOX,
+            QsciScintilla.INDIC_GRADIENT, QsciScintilla.INDIC_GRADIENTCENTRE,
+            QsciScintilla.INDIC_SQUIGGLEPIXMAP,
+            QsciScintilla.INDIC_COMPOSITIONTHICK,
+            QsciScintilla.INDIC_COMPOSITIONTHIN, QsciScintilla.INDIC_TEXTFORE,
+            QsciScintilla.INDIC_POINT, QsciScintilla.INDIC_POINTCHARACTER
+            depending upon QScintilla version)
         @param color color to be used by the indicator (QColor)
         @exception ValueError the indicator or style are not valid
         """
@@ -992,6 +1000,13 @@
         try:
             self.SendScintilla(QsciScintilla.SCI_INDICSETALPHA, indicator,
                                color.alpha())
+            if style in (
+                QsciScintilla.INDIC_ROUNDBOX, QsciScintilla.INDIC_STRAIGHTBOX,
+                QsciScintilla.INDIC_DOTBOX, QsciScintilla.INDIC_FULLBOX,
+            ):
+                # set outline alpha less transparent
+                self.SendScintilla(QsciScintilla.SCI_INDICSETOUTLINEALPHA,
+                                   indicator, color.alpha() + 20)
         except AttributeError:
             pass