diff --git a/TermTk/TTkAbstract/abstractscrollview.py b/TermTk/TTkAbstract/abstractscrollview.py index cfb397f4..8d15148f 100644 --- a/TermTk/TTkAbstract/abstractscrollview.py +++ b/TermTk/TTkAbstract/abstractscrollview.py @@ -46,7 +46,7 @@ class TTkAbstractScrollViewInterface(): def __init__(self) -> None: pass # Override this function - def viewFullAreaSize(self) -> (int, int): + def viewFullAreaSize(self) -> tuple[int,int]: ''' This method returns the full widget area size of the :py:class:`TTkAbstractScrollViewInterface` implementation. @@ -60,7 +60,7 @@ class TTkAbstractScrollViewInterface(): raise NotImplementedError() # Override this function - def viewDisplayedSize(self) -> (int, int): + def viewDisplayedSize(self) -> tuple[int,int]: ''' This method returns the displayed size of the :py:class:`TTkAbstractScrollViewInterface` implementation. @@ -170,7 +170,7 @@ class TTkAbstractScrollView(TTkContainer, TTkAbstractScrollViewInterface): # Do NOT use super() TTkContainer.__init__(self, **kwargs) - def viewDisplayedSize(self) -> (int, int): + def viewDisplayedSize(self) -> tuple[int,int]: return self.size() @pyTTkSlot(int, int) @@ -259,11 +259,11 @@ class TTkAbstractScrollViewLayout(TTkLayout, TTkAbstractScrollViewInterface): self._excludeEvent = False TTkLayout.__init__(self, *args, **kwargs) - def viewFullAreaSize(self) -> (int, int): + def viewFullAreaSize(self) -> tuple[int,int]: _,_,w,h = self.fullWidgetAreaGeometry() return w,h - def viewDisplayedSize(self) -> (int, int): + def viewDisplayedSize(self) -> tuple[int,int]: _,_,w,h = self.geometry() return w,h @@ -378,7 +378,7 @@ class TTkAbstractScrollViewGridLayout(TTkGridLayout, TTkAbstractScrollViewInterf return TTkGridLayout.addItem(self, item, row, col, rowspan, colspan) # Override this function - def viewFullAreaSize(self) -> (int, int): + def viewFullAreaSize(self) -> tuple[int,int]: w,h=0,0 for widget in self.iterWidgets(recurse=False): ww,wh = widget.viewFullAreaSize() @@ -387,7 +387,7 @@ class TTkAbstractScrollViewGridLayout(TTkGridLayout, TTkAbstractScrollViewInterf return w,h # Override this function - def viewDisplayedSize(self) -> (int, int): + def viewDisplayedSize(self) -> tuple[int,int]: w,h=0,0 for widget in self.iterWidgets(recurse=False): ww,wh = widget.viewDisplayedSize() diff --git a/TermTk/TTkCore/helper.py b/TermTk/TTkCore/helper.py index 2c9a4764..0dba989f 100644 --- a/TermTk/TTkCore/helper.py +++ b/TermTk/TTkCore/helper.py @@ -383,7 +383,7 @@ class TTkHelper: return layout.parentWidget() @staticmethod - def absPos(widget) -> (int,int): + def absPos(widget) -> tuple[int,int]: wx, wy = 0,0 layout = widget.widgetItem() while layout: diff --git a/TermTk/TTkTestWidgets/logviewer.py b/TermTk/TTkTestWidgets/logviewer.py index 160db2fc..9ef6fdb3 100644 --- a/TermTk/TTkTestWidgets/logviewer.py +++ b/TermTk/TTkTestWidgets/logviewer.py @@ -48,7 +48,7 @@ class _TTkLogViewer(TTkAbstractScrollView): def _viewChangedHandler(self): self.update() - def viewFullAreaSize(self) -> (int, int): + def viewFullAreaSize(self) -> tuple[int,int]: w = max( m.termWidth() for m in self._messages) h = len(self._messages) return w , h diff --git a/TermTk/TTkTestWidgets/testabstractscroll.py b/TermTk/TTkTestWidgets/testabstractscroll.py index 98fc0025..2dec4879 100644 --- a/TermTk/TTkTestWidgets/testabstractscroll.py +++ b/TermTk/TTkTestWidgets/testabstractscroll.py @@ -60,7 +60,7 @@ class TTkTestAbstractScrollWidget(TTkAbstractScrollView): def mousePressEvent(self, evt): return True def mouseReleaseEvent(self, evt): return True - def viewFullAreaSize(self) -> (int, int): + def viewFullAreaSize(self) -> tuple[int,int]: return self._areaSize diff --git a/TermTk/TTkTestWidgets/tominspector.py b/TermTk/TTkTestWidgets/tominspector.py index 482b671c..03c33933 100644 --- a/TermTk/TTkTestWidgets/tominspector.py +++ b/TermTk/TTkTestWidgets/tominspector.py @@ -69,7 +69,7 @@ class _DetailGridView(TTkAbstractScrollView): x,y = self.getViewOffsets() self._gridLayout.setOffset(-x,-y) - def viewFullAreaSize(self) -> (int, int): + def viewFullAreaSize(self) -> tuple[int,int]: _,_,w,h = self._gridLayout.fullWidgetAreaGeometry() return w , h @@ -115,7 +115,7 @@ class _DetailLazyFormView(TTkAbstractScrollView): x,y = self.getViewOffsets() self.layout().setOffset(-x,-y) - def viewFullAreaSize(self) -> (int, int): + def viewFullAreaSize(self) -> tuple[int,int]: _,_,w,h = self.layout().fullWidgetAreaGeometry() return w , h+1 diff --git a/TermTk/TTkWidgets/Fancy/tableview.py b/TermTk/TTkWidgets/Fancy/tableview.py index 982cba45..6ec8f1f1 100644 --- a/TermTk/TTkWidgets/Fancy/tableview.py +++ b/TermTk/TTkWidgets/Fancy/tableview.py @@ -45,7 +45,7 @@ class _TTkFancyTableViewHeader(TTkAbstractScrollView): self.setMinimumHeight(1) # Override this function - def viewFullAreaSize(self) -> (int, int): + def viewFullAreaSize(self) -> tuple[int,int]: return self.size() @pyTTkSlot(int, int) @@ -190,7 +190,7 @@ class _TTkFancyTableView(TTkAbstractScrollView): - def viewFullAreaSize(self) -> (int, int): + def viewFullAreaSize(self) -> tuple[int,int]: return self._tableWidth, len(self._tableDataText) # def items(self): return self._tableDataText @@ -446,10 +446,10 @@ class TTkFancyTableView(TTkAbstractScrollView): def getViewOffsets(self): return self._tableView.getViewOffsets() - def viewFullAreaSize(self) -> (int, int): + def viewFullAreaSize(self) -> tuple[int,int]: return self._tableView.viewFullAreaSize() - def viewDisplayedSize(self) -> (int, int): + def viewDisplayedSize(self) -> tuple[int,int]: return self._tableView.viewDisplayedSize() def setAlignment(self, *args, **kwargs) : diff --git a/TermTk/TTkWidgets/TTkPickers/textpicker.py b/TermTk/TTkWidgets/TTkPickers/textpicker.py index 9170b6e4..b61221da 100644 --- a/TermTk/TTkWidgets/TTkPickers/textpicker.py +++ b/TermTk/TTkWidgets/TTkPickers/textpicker.py @@ -107,7 +107,7 @@ class _emojiPickerView(TTkAbstractScrollView): x,y = self.getViewOffsets() self.layout().setOffset(-x,-y) - def viewFullAreaSize(self) -> (int, int): + def viewFullAreaSize(self) -> tuple[int,int]: _,_,w,h = self.layout().fullWidgetAreaGeometry() return w , h diff --git a/TermTk/TTkWidgets/TTkTerminal/terminalview.py b/TermTk/TTkWidgets/TTkTerminal/terminalview.py index 09262dc8..834e01c8 100644 --- a/TermTk/TTkWidgets/TTkTerminal/terminalview.py +++ b/TermTk/TTkWidgets/TTkTerminal/terminalview.py @@ -246,7 +246,7 @@ class TTkTerminalView(TTkAbstractScrollView, _TTkTerminal_CSI_DEC): def _viewChangedHandler(self): self.update() - def viewFullAreaSize(self) -> (int, int): + def viewFullAreaSize(self) -> tuple[int,int]: w,h = self.size() h += len(self._screen_current._bufferedLines) return w,h diff --git a/TermTk/TTkWidgets/listwidget.py b/TermTk/TTkWidgets/listwidget.py index bc870190..835e3e79 100644 --- a/TermTk/TTkWidgets/listwidget.py +++ b/TermTk/TTkWidgets/listwidget.py @@ -262,7 +262,7 @@ class TTkListWidget(TTkAbstractScrollView): item.setGeometry(x,y,maxw,h) TTkAbstractScrollView.resizeEvent(self, w, h) - def viewFullAreaSize(self) -> (int, int): + def viewFullAreaSize(self) -> tuple[int,int]: _,_,w,h = self.layout().fullWidgetAreaGeometry() return w, h diff --git a/TermTk/TTkWidgets/scrollarea.py b/TermTk/TTkWidgets/scrollarea.py index e07a8327..da2c1a2c 100644 --- a/TermTk/TTkWidgets/scrollarea.py +++ b/TermTk/TTkWidgets/scrollarea.py @@ -39,7 +39,7 @@ class _TTkAreaWidget(TTkAbstractScrollView): x,y = self.getViewOffsets() self.layout().setOffset(-x,-y) - def viewFullAreaSize(self) -> (int, int): + def viewFullAreaSize(self) -> tuple[int,int]: _,_,w,h = self.layout().fullWidgetAreaGeometry() return w , h diff --git a/TermTk/TTkWidgets/texedit.py b/TermTk/TTkWidgets/texedit.py index 0df38119..2131a057 100644 --- a/TermTk/TTkWidgets/texedit.py +++ b/TermTk/TTkWidgets/texedit.py @@ -71,7 +71,7 @@ class _TTkTextEditViewLineNumber(TTkAbstractScrollView): tw.wrapChanged.connect(self._wrapChanged) self._wrapChanged() - def viewFullAreaSize(self) -> (int, int): + def viewFullAreaSize(self) -> tuple[int,int]: if self._textWrap: return 5, self._textWrap.size() else: @@ -427,7 +427,7 @@ class TTkTextEditView(TTkAbstractScrollView): def _updateSize(self): self._hsize = max( len(l) for l in self._textDocument._dataLines ) + 1 - def viewFullAreaSize(self) -> (int, int): + def viewFullAreaSize(self) -> tuple[int,int]: if self.lineWrapMode() == TTkK.NoWrap: return self._hsize, self._textWrap.size() elif self.lineWrapMode() == TTkK.WidgetWidth: