chore: fix mypy

libs/pyTermTk/TermTk/TTkCore/constant.py

@@ -20,6 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+from __future__ import annotations
+
 __all__ = ['TTkConstant', 'TTkK']
 
 from enum import IntEnum, Flag
@@ -274,6 +276,12 @@ class TTkConstant:
         DescendingOrder = 0x01
         '''The items are sorted descending e.g. starts with 'ZZZ' ends with 'AAA' in Latin-1 locales'''
 
+        def invert(order:TTkConstant.SortOrder) -> TTkConstant.SortOrder:
+            if order == TTkConstant.SortOrder.AscendingOrder:
+                return TTkConstant.SortOrder.AscendingOrder
+            else:
+                return TTkConstant.SortOrder.DescendingOrder
+
     AscendingOrder  = SortOrder.AscendingOrder
     DescendingOrder = SortOrder.DescendingOrder
 

libs/pyTermTk/TermTk/TTkGui/drag.py

@@ -22,7 +22,7 @@
 
 __all__ = ['TTkDrag', 'TTkDnDEvent', 'TTkDnD']
 
-from typing import Any
+from typing import Any, Union
 
 from TermTk.TTkCore.helper    import TTkHelper
 from TermTk.TTkCore.canvas    import TTkCanvas
@@ -149,7 +149,7 @@ class TTkDrag(TTkDnD):
         super().__init__(**kwargs)
 
     # def setPixmap(self, pixmap:TTkWidget|TTkCanvas) -> None:
-    def setPixmap(self, pixmap:TTkWidget) -> None:
+    def setPixmap(self, pixmap:Union[TTkWidget,TTkCanvas]) -> None:
         '''
         Sets the pixmap used to represent the data in a drag and drop operation.
         If a :py:class:`TTkWidget` is provided as pixmap, its default rendering will be used in the pixmap :py:class:`TTkCanvas`.

libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/treewidget.py

@@ -43,7 +43,7 @@ from dataclasses import dataclass
 class _RootWidgetItem(TTkTreeWidgetItem):
     __slots__ = ('_widgets_buffer','_widgets_buffer_check')
 
-    _widgets_buffer:List[int]
+    _widgets_buffer:List[tuple[int, int, TTkTreeWidgetItem]]
     _widgets_buffer_check:int
 
     def __init__(self):
@@ -222,7 +222,7 @@ class TTkTreeWidget(TTkAbstractScrollView):
                     'separatorColor': TTkColor.fg("#888888")},
             }
 
-    __slots__ = ( '_rootItem', '_cache',
+    __slots__ = ( '_rootItem',
                   '_header', '_columnsPos',
                   '_selectionMode',
                   '_selectedId', '_selected', '_separatorSelected',
@@ -234,11 +234,12 @@ class TTkTreeWidget(TTkAbstractScrollView):
 
     _selected:List[TTkTreeWidgetItem]
     _rootItem:_RootWidgetItem
+    _separatorSelected:Optional[int]
 
     @dataclass(frozen=True)
     class _DropTreeData:
         widget: TTkAbstractScrollView
-        items: List[TTkAbstractItemModel]
+        items: List[TTkTreeWidgetItem]
 
     def __init__(self, *,
                  header:List[TTkString]=[],
@@ -263,9 +264,6 @@ class TTkTreeWidget(TTkAbstractScrollView):
         self._itemDoubleClicked = pyTTkSignal(TTkTreeWidgetItem, int)
         self._itemExpanded      = pyTTkSignal(TTkTreeWidgetItem)
         self._itemCollapsed     = pyTTkSignal(TTkTreeWidgetItem)
-
-        self._cache = []
-
         self._selectionMode = selectionMode
         self._dndMode = dragDropMode
         self._selected = []
@@ -404,7 +402,7 @@ class TTkTreeWidget(TTkAbstractScrollView):
         '''
         if self._selected:
             return self._selected
-        return None
+        return []
 
     def setHeaderLabels(self, labels:List[TTkString]) -> None:
         '''
@@ -602,7 +600,7 @@ class TTkTreeWidget(TTkAbstractScrollView):
                     break
                 elif x < c:
                     # I-th header selected
-                    order = not self._sortOrder if self._sortColumn == i else TTkK.AscendingOrder
+                    order = TTkK.SortOrder.invert(self._sortOrder) if self._sortColumn == i else TTkK.AscendingOrder
                     self.sortItems(i, order)
                     break
             return True
@@ -644,6 +642,7 @@ class TTkTreeWidget(TTkAbstractScrollView):
             self.itemClicked.emit(item, col)
             self.update()
             return True
+        return True
 
     def mouseDragEvent(self, evt:TTkMouseEvent) -> bool:
         #    columnPos       (Selected = 2)

libs/pyTermTk/TermTk/TTkWidgets/TTkModelView/treewidgetitem.py

@@ -188,10 +188,10 @@ class _TTkTreeChildren(TTkAbstractItemModel):
     def children(self) -> List[TTkTreeWidgetItem]:
         return self._children
 
-    def indexOfChild(self, child:TTkTreeWidgetItem) -> Optional[int]:
+    def indexOfChild(self, child:TTkTreeWidgetItem) -> int:
         if child in self._children:
             return self._children.index(child)
-        return None
+        return -1
 
     def expandAll(self) -> None:
         for child in self._children: