Mercurial Repositories > eric / file diff

--- a/eric7/QScintilla/QsciScintillaCompat.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/QsciScintillaCompat.py	Sun May 16 20:07:24 2021 +0200
@@ -9,10 +9,10 @@
 
 import contextlib
 
-from PyQt5.QtCore import pyqtSignal, Qt, QPoint
-from PyQt5.QtGui import QPalette, QColor, QFontMetrics
-from PyQt5.QtWidgets import QApplication, QListWidget
-from PyQt5.Qsci import (
+from PyQt6.QtCore import pyqtSignal, Qt, QPoint
+from PyQt6.QtGui import QPalette, QColor, QFontMetrics
+from PyQt6.QtWidgets import QApplication, QListWidget
+from PyQt6.Qsci import (
     QsciScintillaBase, QsciScintilla,
     QSCINTILLA_VERSION as QSCIQSCINTILLA_VERSION
 )
@@ -43,7 +43,7 @@
     """
     zoomValueChanged = pyqtSignal(int)
     
-    ArrowFoldStyle = QsciScintilla.FoldStyle.BoxedTreeFoldStyle + 1
+    ArrowFoldStyle = QsciScintilla.FoldStyle.BoxedTreeFoldStyle.value + 1
     ArrowTreeFoldStyle = ArrowFoldStyle + 1
     
     UserSeparator = '\x04'
@@ -1304,8 +1304,8 @@
         @param style folding style to set (integer)
         @param margin margin number (integer)
         """
-        if style < self.ArrowFoldStyle:
-            super().setFolding(style, margin)
+        if isinstance(style, QsciScintilla.FoldStyle):
+            super().setFolding(QsciScintilla.FoldStyle(style), margin)
         else:
             super().setFolding(
                 QsciScintilla.FoldStyle.PlainFoldStyle, margin)