From ef83f2ed6d1025917a9cad722fe532621c5af037 Mon Sep 17 00:00:00 2001 From: Christian Ludwig Date: Fri, 9 Dec 2022 17:26:36 +0100 Subject: [PATCH 1/2] TText: use TTkString for textUpdated --- TermTk/TTkTemplates/text.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TermTk/TTkTemplates/text.py b/TermTk/TTkTemplates/text.py index 9636267d..c4cef58d 100644 --- a/TermTk/TTkTemplates/text.py +++ b/TermTk/TTkTemplates/text.py @@ -46,5 +46,5 @@ class TText(): self._text = text else: self._text = TTkString(text) - self.textUpdated(text) + self.textUpdated(self._text) From 728fd83a7807156beb2c9d6ea59b2505896f8e1e Mon Sep 17 00:00:00 2001 From: Christian Ludwig Date: Fri, 9 Dec 2022 17:27:07 +0100 Subject: [PATCH 2/2] TTkLabel: use termWidth --- TermTk/TTkWidgets/label.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/TermTk/TTkWidgets/label.py b/TermTk/TTkWidgets/label.py index 28eba8b4..bd557d3c 100644 --- a/TermTk/TTkWidgets/label.py +++ b/TermTk/TTkWidgets/label.py @@ -33,11 +33,11 @@ class TTkLabel(TTkWidget, TColor, TText): TColor.__init__(self, *args, **kwargs) TText.__init__(self, *args, **kwargs) - self.setDefaultSize(kwargs, len(self.text), 1) + self.setDefaultSize(kwargs, self.text.termWidth(), 1) TTkWidget.__init__(self, *args, **kwargs) self._name = kwargs.get('name' , 'TTkLabel' ) - # self.setMinimumSize(len(self.text), 1) + # self.setMinimumSize(self.text.termWidth(), 1) self.textUpdated(self.text) @pyTTkSlot(str) @@ -51,9 +51,10 @@ class TTkLabel(TTkWidget, TColor, TText): def textUpdated(self, text): w, h = self.size() - if w