From 5c3ba65d50b9fa30deaef95292abd98e8ea9d074 Mon Sep 17 00:00:00 2001
From: Eugenio Parodi <ceccopierangiolieugenio@googlemail.com>
Date: Sun, 27 Mar 2022 13:20:01 +0100
Subject: [PATCH] TTkTabBar: added small layout

---
 TermTk/TTkCore/canvas.py       |  9 ++++++++-
 TermTk/TTkWidgets/tabwidget.py | 32 +++++++++++++++++++++++---------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/TermTk/TTkCore/canvas.py b/TermTk/TTkCore/canvas.py
index 3044d003..103e4412 100644
--- a/TermTk/TTkCore/canvas.py
+++ b/TermTk/TTkCore/canvas.py
@@ -373,7 +373,14 @@ class TTkCanvas:
         w,h = size
         tt = TTkCfg.theme.tab
         if small:
-            pass
+            if status == TTkK.Checked:
+                txtCenter = tt[10] + label        + tt[10]
+                txtBottom = tt[21] + tt[5] *(w-2) + tt[22]
+            else:
+                txtCenter = tt[9]  + label        + tt[9]
+                txtBottom = tt[18] + tt[19]*(w-2) + tt[20]
+            self.drawText(pos=(x,y+0),text=txtCenter)
+            self.drawText(pos=(x,y+1),text=txtBottom)
         else:
             if status == TTkK.Checked:
                 txtTop    = tt[4]  + tt[5] *(w-2) + tt[6]
diff --git a/TermTk/TTkWidgets/tabwidget.py b/TermTk/TTkWidgets/tabwidget.py
index e9611794..c986196e 100644
--- a/TermTk/TTkWidgets/tabwidget.py
+++ b/TermTk/TTkWidgets/tabwidget.py
@@ -94,14 +94,23 @@ class _TTkTabScrollerButton(TTkButton):
 
     def paintEvent(self):
         tt = TTkCfg.theme.tab
-        if self._side == TTkK.LEFT:
-            self._canvas.drawText(pos=(0,0),text=tt[7] +tt[1])
-            self._canvas.drawText(pos=(0,1),text=tt[9] +tt[31])
-            self._canvas.drawText(pos=(0,2),text=tt[11]+tt[12])
+        if self._border:
+            if self._side == TTkK.LEFT:
+                self._canvas.drawText(pos=(0,0),text=tt[7] +tt[1])
+                self._canvas.drawText(pos=(0,1),text=tt[9] +tt[31])
+                self._canvas.drawText(pos=(0,2),text=tt[11]+tt[12])
+            else:
+                self._canvas.drawText(pos=(0,0),text=tt[1] +tt[8])
+                self._canvas.drawText(pos=(0,1),text=tt[32]+tt[9])
+                self._canvas.drawText(pos=(0,2),text=tt[12]+tt[15])
         else:
-            self._canvas.drawText(pos=(0,0),text=tt[1] +tt[8])
-            self._canvas.drawText(pos=(0,1),text=tt[32]+tt[9])
-            self._canvas.drawText(pos=(0,2),text=tt[12]+tt[15])
+            if self._side == TTkK.LEFT:
+                self._canvas.drawText(pos=(0,0),text=tt[9] +tt[31])
+                self._canvas.drawText(pos=(0,1),text=tt[23]+tt[1])
+            else:
+                self._canvas.drawText(pos=(0,0),text=tt[32]+tt[9])
+                self._canvas.drawText(pos=(0,1),text=tt[1] +tt[24])
+
 '''
 _curentIndex =              2
 _labelPos =      [0],[1],  [2],   [3],   [4],
@@ -227,8 +236,13 @@ class TTkTabBar(TTkWidget):
         self.update()
 
     def paintEvent(self):
-        if self._small: return
-        self._canvas.drawTabWidgetBottomLine(pos=(0,2), size=self.size())
+        w = self.width()
+        tt = TTkCfg.theme.tab
+        if self._small:
+            self._canvas.drawText(pos=(0,1),text=tt[23] + tt[19]*(w-2) + tt[24])
+        else:
+            self._canvas.drawText(pos=(0,2),text=tt[11] + tt[12]*(w-2) + tt[15])
+
 
 '''
            ┌────────────────────────────┐