From c743c492e88edbc7a6057b831bd829a0bc75beaa Mon Sep 17 00:00:00 2001 From: slook <88614182+slook@users.noreply.github.com> Date: Mon, 16 Feb 2026 15:45:52 +0000 Subject: [PATCH] fix(TTkTabBar): currentIndex <= highlighted TypeError (#593) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Parodi, Eugenio 🌶 --- libs/pyTermTk/TermTk/TTkWidgets/tabwidget.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/libs/pyTermTk/TermTk/TTkWidgets/tabwidget.py b/libs/pyTermTk/TermTk/TTkWidgets/tabwidget.py index 5190a9f5..08cc1acb 100644 --- a/libs/pyTermTk/TermTk/TTkWidgets/tabwidget.py +++ b/libs/pyTermTk/TermTk/TTkWidgets/tabwidget.py @@ -96,7 +96,6 @@ class _TTkTabStatus(): @pyTTkSlot() def _moveToTheLeft(self) -> None: self._setCurrentIndex(self.currentIndex-1) - @pyTTkSlot() def _andMoveToTheRight(self) -> None: self._setCurrentIndex(self.currentIndex+1) @@ -121,8 +120,12 @@ class _TTkTabStatus(): # index = self.tabButtons.index(button) # self._setCurrentIndex(index) + def _selectHighlighted(self) -> None: + if self.highlighted is not None: + self._setCurrentIndex(self.highlighted) + @pyTTkSlot(int) - def _setCurrentIndex(self, index) -> None: + def _setCurrentIndex(self, index:int) -> None: '''setCurrentIndex''' if ( ( 0 <= index < len(self.tabButtons) ) and ( self.currentIndex != index or @@ -133,12 +136,6 @@ class _TTkTabStatus(): self.currentChanged.emit(index) self.statusUpdated.emit() - @pyTTkSlot(int) - def _resetHighlighted(self) -> None: - if self.highlighted != -1: - self.highlighted = None - self.statusUpdated.emit() - def _insertButton(self, index:int, button:TTkTabButton) -> None: self.tabButtons.insert(index,button) self.statusUpdated.connect(button.update) @@ -865,7 +862,7 @@ class TTkTabBar(TTkContainer): return True if ( evt.type == TTkK.Character and evt.key==" " ) or \ ( evt.type == TTkK.SpecialKey and evt.key == TTkK.Key_Enter ): - self._tabStatus._setCurrentIndex(self._tabStatus.highlighted) + self._tabStatus._selectHighlighted() return True return False