From 5e4a5ae9bcba528c5ad48cb7aeb29198a2e87895 Mon Sep 17 00:00:00 2001 From: Eugenio Parodi Date: Mon, 18 Apr 2022 20:05:59 +0100 Subject: [PATCH] TTkTebWidget: add data, fixed patch apply in the Makefile --- Makefile | 2 +- TermTk/TTkWidgets/tabwidget.py | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index b922c924..71988269 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ . .venv/bin/activate ; \ pip install -r docs/requirements.txt # Add "Signal" option in the method domains - patch -p0 < docs/sphynx.001.signal.patch + patch -p3 -d .venv/lib/python3*/ < docs/sphynx.001.signal.patch # Regen requirements; # pip freeze > docs/requirements.txt diff --git a/TermTk/TTkWidgets/tabwidget.py b/TermTk/TTkWidgets/tabwidget.py index 959619cf..2505fbdb 100644 --- a/TermTk/TTkWidgets/tabwidget.py +++ b/TermTk/TTkWidgets/tabwidget.py @@ -1,6 +1,3 @@ - - - #!/usr/bin/env python3 # MIT License @@ -273,7 +270,7 @@ class TTkTabBar(TTkWidget): self._updateTabs() def addTab(self, label, data=None): - self.insertTab(len(self._tabButtons), label) + self.insertTab(len(self._tabButtons), label, data) def insertTab(self, index, label, data=None): button = TTkTabButton(parent=self, text=label, border=not self._small, closable=self._tabClosable) @@ -564,7 +561,8 @@ class TTkTabWidget(TTkFrame): tb = data.tabButton() tw = data.tabWidget() index = tw._tabBar._tabButtons.index(tb) - widget = tw._tabWidgets[index] + widget = tw.widget(index) + data = tw.data(index) if TTkHelper.isParent(self, tw): return False if y < 3: @@ -577,13 +575,13 @@ class TTkTabWidget(TTkFrame): if index <= newIndex: newIndex -= 1 tw.removeTab(index) - self.insertTab(newIndex, widget, tb.text) + self.insertTab(newIndex, widget, tb.text, data) self.setCurrentIndex(newIndex) #self._tabChanged(newIndex) elif tw != self: tw.removeTab(index) newIndex = len(self._tabWidgets) - self.addTab(widget, tb.text) + self.addTab(widget, tb.text, data) self.setCurrentIndex(newIndex) self._tabChanged(newIndex)