Reworked the color foreground/background method and aligned toe code to it

TermTk/TTkCore/canvas.py

@@ -42,6 +42,8 @@ class TTkCanvas():
         '_data', '_colors',
         '_bufferedData', '_bufferedColors',
         '_visible', '_transparent', '_doubleBuffer')
+    _data:list[str]
+    _colors:list[TTkColor]
     def __init__(self,
                  width:int=0,
                  height:int=0) -> None:
@@ -50,7 +52,7 @@ class TTkCanvas():
         self._doubleBuffer = False
         self._width = 0
         self._height = 0
-        self._data = [[]]
+        self._data   = [[]]
         self._colors = [[]]
         self._newWidth = width
         self._newHeight = height

TermTk/TTkCore/color.py

@@ -64,7 +64,8 @@ from TermTk.TTkCore.helper import TTkHelper
 
 class _TTkColor:
     __slots__ = ('_fg','_bg', '_colorMod', '_buffer', '_clean')
-    _fg: tuple[int]; _bg: tuple[int];
+    _fg: tuple[int]
+    _bg: tuple[int]
     def __init__(self,
                  fg:tuple[int]=None,
                  bg:tuple[int]=None,
@@ -80,13 +81,19 @@ class _TTkColor:
         if self._fg:
             return _TTkColor(fg=self._fg)
         else:
-            return None
+            return TTkColor.RST
 
     def background(self):
         if self._bg:
             return _TTkColor(bg=self._bg)
         else:
-            return None
+            return TTkColor.RST
+
+    def hasForeground(self) -> bool:
+        return True if self._fg else False
+
+    def hasBackground(self) -> bool:
+        return True if self._bg else False
 
     def bold(self) -> bool:
         return  False

TermTk/TTkWidgets/TTkPickers/colorpicker.py

@@ -207,10 +207,10 @@ class _TTkColorButton(TTkButton):
         style = self.style()
         for t in style:
             if 'color' in style[t]:
-                if   fg := color.foreground():
+                if   TTkK.ColorType.Foreground & (colorType := color.colorType()):
-                    style[t]['color'] = fg.invertFgBg()
+                    style[t]['color'] = color.foreground().invertFgBg()
-                elif bg := color.background():
+                elif TTkK.ColorType.Background & colorType:
-                    style[t]['color'] = bg
+                    style[t]['color'] = color.background()
                 else:
                     style[t]['color'] = TTkColor.BG_BLACK
         self.setStyle(style)
@@ -223,12 +223,16 @@ class _TTkColorButton(TTkButton):
         self._returnType = returnType
 
     def color(self) -> TTkColor:
-        fg = self._color.foreground()
-        bg = self._color.background()
         if self._returnType==TTkK.ColorPickerReturnType.Foreground:
-            return fg if fg else bg.invertFgBg() if bg else TTkColor.RST
+            if self._color.colorType() & TTkK.ColorType.Foreground:
+                return self._color.foreground()
+            else:
+                return self._color.background().invertFgBg()
         if self._returnType==TTkK.ColorPickerReturnType.Background:
-            return bg if bg else fg.invertFgBg() if fg else TTkColor.RST
+            if self._color.colorType() & TTkK.ColorType.Background:
+                return self._color.background()
+            else:
+                return self._color.foreground().invertFgBg()
         return self._color
 
     def isCustom(self) -> bool:
@@ -549,12 +553,16 @@ class TTkColorDialogPicker(TTkWindow):
         :return: the current color
         :rtype: :py:class:`TTkColor`
         '''
-        fg = self._color.foreground()
-        bg = self._color.background()
         if self._returnType==TTkK.ColorPickerReturnType.Foreground:
-            return fg if fg else bg.invertFgBg() if bg else TTkColor.RST
+            if self._color.colorType() & TTkK.ColorType.Foreground:
+                return self._color.foreground()
+            else:
+                return self._color.background().invertFgBg()
         if self._returnType==TTkK.ColorPickerReturnType.Background:
-            return bg if bg else fg.invertFgBg() if fg else TTkColor.RST
+            if self._color.colorType() & TTkK.ColorType.Background:
+                return self._color.background()
+            else:
+                return self._color.foreground().invertFgBg()
         return self._color
 
     def setColor(self, color:TTkColor) -> None:
@@ -663,10 +671,12 @@ class TTkColorButtonPicker(_TTkColorButton):
 
     @pyTTkSlot(TTkColor)
     def _processColorSelected(self, color:TTkColor):
-        if   fg := self.color().foreground():
+        if   TTkK.ColorType.Foreground & (colorType := color.colorType()):
-            bg = fg.invertFgBg()
+            fg = color.foreground()
-        elif bg := self.color().background():
+            bg = color.foreground().invertFgBg()
-            fg = bg.invertFgBg()
+        elif TTkK.ColorType.Background &  colorType:
+            fg = color.background().invertFgBg()
+            bg = color.background()
         else:
             fg = TTkColor.BLACK
             bg = TTkColor.BG_BLACK

TermTk/TTkWidgets/TTkPickers/textpicker.py

@@ -173,18 +173,18 @@ class TTkTextDialogPicker(TTkWindow):
 
         @pyTTkSlot(TTkColor)
         def _currentColorChangedCB(format:TTkColor):
-            if fg := format.foreground():
+            if TTkK.ColorType.Foreground & (colorType := format.colorType()):
                 cb_fg.setCheckState(TTkK.Checked)
                 btn_fgColor.setEnabled()
-                btn_fgColor.setColor(fg)
+                btn_fgColor.setColor(format.foreground())
             else:
                 cb_fg.setCheckState(TTkK.Unchecked)
                 btn_fgColor.setDisabled()
 
-            if bg := format.background():
+            if TTkK.ColorType.Background &  colorType:
                 cb_bg.setCheckState(TTkK.Checked)
                 btn_bgColor.setEnabled()
-                btn_bgColor.setColor(bg)
+                btn_bgColor.setColor(format.background())
             else:
                 cb_bg.setCheckState(TTkK.Unchecked)
                 btn_bgColor.setDisabled()

demo/showcase/textedit.py

@@ -157,19 +157,19 @@ def demoTextEdit(root=None, document=None):
     fontLayout.addWidget(superSimpleHorizontalLine(),0,12,2,1)
 
     @ttk.pyTTkSlot(ttk.TTkColor)
-    def _currentColorChangedCB(format):
+    def _currentColorChangedCB(format:ttk.TTkColor):
-        if fg := format.foreground():
+        if ttk.TTkK.ColorType.Foreground & (colorType := format.colorType()):
             cb_fg.setCheckState(ttk.TTkK.Checked)
             btn_fgColor.setEnabled()
-            btn_fgColor.setColor(fg)
+            btn_fgColor.setColor(format.foreground())
         else:
             cb_fg.setCheckState(ttk.TTkK.Unchecked)
             btn_fgColor.setDisabled()
 
-        if bg := format.background():
+        if ttk.TTkK.ColorType.Background &  colorType:
             cb_bg.setCheckState(ttk.TTkK.Checked)
             btn_bgColor.setEnabled()
-            btn_bgColor.setColor(bg)
+            btn_bgColor.setColor(format.background())
         else:
             cb_bg.setCheckState(ttk.TTkK.Unchecked)
             btn_bgColor.setDisabled()

tests/t.ui/test.ui.020.TextEdit.01.UndoRedo.py

@@ -76,19 +76,19 @@ def demoTextEdit(root=None, document=None):
     fontLayout.addWidget(superSimpleHorizontalLine(),0,10,2,1)
 
     @ttk.pyTTkSlot(ttk.TTkColor)
-    def _currentColorChangedCB(format):
+    def _currentColorChangedCB(format:ttk.TTkColor):
-        if fg := format.foreground():
+        if ttk.TTkK.ColorType.Foreground & (colorType := format.colorType()):
             cb_fg.setCheckState(ttk.TTkK.Checked)
             btn_fgColor.setEnabled()
-            btn_fgColor.setColor(fg.invertFgBg())
+            btn_fgColor.setColor(format.foreground())
         else:
             cb_fg.setCheckState(ttk.TTkK.Unchecked)
             btn_fgColor.setDisabled()
 
-        if bg := format.background():
+        if ttk.TTkK.ColorType.Background &  colorType:
             cb_bg.setCheckState(ttk.TTkK.Checked)
             btn_bgColor.setEnabled()
-            btn_bgColor.setColor(bg)
+            btn_bgColor.setColor(format.background())
         else:
             cb_bg.setCheckState(ttk.TTkK.Unchecked)
             btn_bgColor.setDisabled()

tools/dumb.image.tool.py

@@ -84,19 +84,19 @@ class Ansieditor(ttk.TTkGridLayout):
         btn_redo.clicked.connect(self._te.redo)
 
         @ttk.pyTTkSlot(ttk.TTkColor)
-        def _currentColorChangedCB(format):
+        def _currentColorChangedCB(format:ttk.TTkColor):
-            if fg := format.foreground():
+            if ttk.TTkK.ColorType.Foreground & (colorType := format.colorType()):
                 cb_fg.setCheckState(ttk.TTkK.Checked)
                 btn_fgColor.setEnabled()
-                btn_fgColor.setColor(fg.invertFgBg())
+                btn_fgColor.setColor(format.foreground())
             else:
                 cb_fg.setCheckState(ttk.TTkK.Unchecked)
                 btn_fgColor.setDisabled()
 
-            if bg := format.background():
+            if ttk.TTkK.ColorType.Background &  colorType:
                 cb_bg.setCheckState(ttk.TTkK.Checked)
                 btn_bgColor.setEnabled()
-                btn_bgColor.setColor(bg)
+                btn_bgColor.setColor(format.background())
             else:
                 cb_bg.setCheckState(ttk.TTkK.Unchecked)
                 btn_bgColor.setDisabled()

tools/dumbPaintTool/app/canvaslayer.py

@@ -278,8 +278,9 @@ class CanvasLayer():
             palette = outData['palette'] = []
             for row in colors:
                 for c in row:
-                    fg = f"{c.getHex(ttk.TTkK.Foreground)}" if c.foreground() else None
+                    colorType = c.colorType()
-                    bg = f"{c.getHex(ttk.TTkK.Background)}" if c.background() else None
+                    fg = f"{c.getHex(ttk.TTkK.ColorType.Foreground)}" if (colorType&ttk.TTkK.ColorType.Foreground) else None
+                    bg = f"{c.getHex(ttk.TTkK.ColorType.Background)}" if (colorType&ttk.TTkK.ColorType.Background) else None
                     if (pc:=(fg,bg)) not in palette:
                         palette.append(pc)
 
@@ -296,8 +297,9 @@ class CanvasLayer():
         for row in colors[hslice]:
             outData['colors'].append([])
             for c in row[wslice]:
-                fg = f"{c.getHex(ttk.TTkK.Foreground)}" if c.foreground() else None
+                colorType = c.colorType()
-                bg = f"{c.getHex(ttk.TTkK.Background)}" if c.background() else None
+                fg = f"{c.getHex(ttk.TTkK.ColorType.Foreground)}" if (colorType&ttk.TTkK.ColorType.Foreground) else None
+                bg = f"{c.getHex(ttk.TTkK.ColorType.Background)}" if (colorType&ttk.TTkK.ColorType.Background) else None
                 if palette:
                     outData['colors'][-1].append(palette.index((fg,bg)))
                 else:
@@ -493,18 +495,15 @@ class CanvasLayer():
                 colors[oy+y][ox+x] = color
             else:
                 glyph = data[  oy+y][ox+x]
-                ofg = colors[oy+y][ox+x].foreground()
+                oColorType = (oc:=colors[oy+y][ox+x]).colorType()
-                obg = colors[oy+y][ox+x].background()
+                nColorType = (nc:=color).colorType()
-                nfg = color.foreground()
-                nbg = color.background()
                 if glyph==' ':
-                    if obg:
+                    if oColorType & ttk.TTkK.ColorType.Background:
-                        colors[oy+y][ox+x] = nbg if nbg else ttk.TTkColor.RST
+                        colors[oy+y][ox+x] = nc.background()
                 else:
-                    fg = nfg if nfg         else ofg if ofg else ttk.TTkColor.RST
+                    fg = nc.foreground() if ttk.TTkK.ColorType.Foreground & nColorType              else oc.foreground()
-                    bg = nbg if nbg and obg else obg if obg else fg
+                    bg = nc.background() if ttk.TTkK.ColorType.Background & nColorType & oColorType else oc.background() if ttk.TTkK.ColorType.Background & oColorType else fg
                     color = fg+bg
-                    color = color if color else ttk.TTkColor.RST
                     colors[oy+y][ox+x] = color
             return True
         return False

tools/dumbPaintTool/app/importimage.py

@@ -323,21 +323,19 @@ class TTkImageNew(ttk.TTkWidget):
         s = (0,0,w,h)
         for y,(rowd,rowc) in enumerate(zip(self._canvasImage._data[:h],self._canvasImage._colors[:h])):
             for x,(gl,c) in enumerate(zip(rowd[:w],rowc[:w])):
-                nfg = c.foreground()
+                nColorType = c.colorType()
-                nbg = c.background()
+                if gl == ' ' and not (nColorType & ttk.TTkK.ColorType.Background):
-                if gl == ' ' and not nbg:
                     continue
                 elif gl == ' ':
                     canvas._data[  y][x] = ' '
-                    canvas._colors[y][x] = nbg
+                    canvas._colors[y][x] = c.background()
-                elif not nbg:
+                elif not (nColorType & ttk.TTkK.ColorType.Background):
                     nbg = canvas._colors[y][x].background()
                     canvas._data[  y][x] = gl
-                    canvas._colors[y][x] = nbg + nfg if nbg else nfg
+                    canvas._colors[y][x] = c.foreground() + nbg
                 else:
                     canvas._data[  y][x] = gl
                     canvas._colors[y][x] = c
-        # canvas.paintCanvas(self._canvasImage,s,s,s)
 
 class ImagePreview(TTkImageNew):
     __slots__ = ('_trColor1','_trColor2')

tools/dumbPaintTool/app/paintarea.py

@@ -200,25 +200,25 @@ class PaintArea(ttk.TTkAbstractScrollView):
         if self._tool & ToolType.PICKGLYPH:
             if mp:
                 mpx,mpy = mp
-                color = None
+                color = ttk.TTkColor.RST
                 glyph = None
                 for lm in glbls.layers.layers():
                     lmx,lmy = lm.pos()
                     if lm.isOpaque(mpx-lmx-dx,mpy-lmy-dy):
                         _gl, _co = lm.glyphColorAt(mpx-lmx-dx,mpy-lmy-dy)
-                        if not glyph and not color:
+                        if not glyph and color == ttk.TTkColor.RST:
                             glyph = _gl
                             color = _co
-                        elif not color.background():
+                        elif color.background() == ttk.TTkColor.RST:
-                            if _co.background():
+                            if _co.background() != ttk.TTkColor.RST:
-                                if _fg:=color.foreground():
+                                if (_fg:=color.foreground()) != ttk.TTkColor.RST:
                                     color = _fg + _co.background()
                                 else:
                                     color = _co.background()
                         else:
                             break
                 glbls.brush.setColor(color)
-                glbls.brush.setGlyph(glyph)
+                glbls.brush.setGlyph(glyph if glyph else ' ')
             if mr:
                 glbls.brush.setToolType(self._tool & ~ToolType.PICKGLYPH)
                 self._mousePress   = None

tools/dumbPaintTool/app/painttoolkit.py

@@ -143,18 +143,18 @@ class PaintToolKit(ttk.TTkContainer):
 
     @ttk.pyTTkSlot(ttk.TTkColor)
     def setColor(self, color:ttk.TTkColor):
-        if fg := color.foreground():
+        if ttk.TTkK.ColorType.Foreground & (colorType := color.colorType()):
             self._cbFg.setCheckState(ttk.TTkK.Checked)
             self._bpFg.setEnabled()
-            self._bpFg.setColor(fg)
+            self._bpFg.setColor(color.foreground())
         else:
             self._cbFg.setCheckState(ttk.TTkK.Unchecked)
             self._bpFg.setDisabled()
 
-        if bg := color.background():
+        if ttk.TTkK.ColorType.Background &  colorType:
             self._cbBg.setCheckState(ttk.TTkK.Checked)
             self._bpBg.setEnabled()
-            self._bpBg.setColor(bg)
+            self._bpBg.setColor(color.background())
         else:
             self._cbBg.setCheckState(ttk.TTkK.Unchecked)
             self._bpBg.setDisabled()

tools/dumbPaintTool/app/palette.py

@@ -84,8 +84,8 @@ class Palette(ttk.TTkWidget):
     def setColor(self, color:ttk.TTkColor) -> None:
         fg = color.foreground()
         bg = color.background()
-        self.enableFg(fg!=None)
+        self.enableFg(fg!=ttk.TTkColor.RST)
-        self.enableBg(bg!=None)
+        self.enableBg(bg!=ttk.TTkColor.RST)
         def _getPos(col):
             for y,row in enumerate(self._palette):
                 for x,c in enumerate(row):
@@ -93,14 +93,14 @@ class Palette(ttk.TTkWidget):
                         return x,y
             return None
         pw, ph = len(self._palette[0]),len(self._palette)
-        if fg:
+        if fg!=ttk.TTkColor.RST:
             if (pos:=_getPos(fg)) != None:
                 self._fg = pos
             else:
                 self._fg = (pw-2,ph-1)
                 self._palette[ph-1][pw-2] = (fg,fg.invertFgBg())
 
-        if bg:
+        if bg!=ttk.TTkColor.RST:
             if (pos:=_getPos(bg)) != None:
                 self._bg = pos
             else:

tools/dumbPaintTool/app/textarea.py

@@ -133,19 +133,19 @@ class TextArea(ttk.TTkGridLayout):
         btn_redo.clicked.connect(self._te.redo)
 
         @ttk.pyTTkSlot(ttk.TTkColor)
-        def _currentColorChangedCB(format):
+        def _currentColorChangedCB(format:ttk.TTkColor):
-            if fg := format.foreground():
+            if ttk.TTkK.ColorType.Foreground & (colorType := format.colorType()):
                 cb_fg.setCheckState(ttk.TTkK.Checked)
                 btn_fgColor.setEnabled()
-                btn_fgColor.setColor(fg)
+                btn_fgColor.setColor(format.foreground())
             else:
                 cb_fg.setCheckState(ttk.TTkK.Unchecked)
                 btn_fgColor.setDisabled()
 
-            if bg := format.background():
+            if ttk.TTkK.ColorType.Background &  colorType:
                 cb_bg.setCheckState(ttk.TTkK.Checked)
                 btn_bgColor.setEnabled()
-                btn_bgColor.setColor(bg)
+                btn_bgColor.setColor(format.background())
             else:
                 cb_bg.setCheckState(ttk.TTkK.Unchecked)
                 btn_bgColor.setDisabled()

tools/dumbPaintTool/app/toolspanel.py

@@ -212,8 +212,8 @@ class ToolsPanel(ttk.TTkVBoxLayout):
                 ttk.TTkString("Glyph: '") +
                 ttk.TTkString(glyph,color) +
                 ttk.TTkString("'"))
-        self._cb_p_fg.setChecked(None != color.foreground())
+        self._cb_p_fg.setChecked(ttk.TTkColor.RST != color.foreground())
-        self._cb_p_bg.setChecked(None != color.background())
+        self._cb_p_bg.setChecked(ttk.TTkColor.RST != color.background())
 
     @ttk.pyTTkSlot(ttk.TTkColor)
     def setColor(self, color:ttk.TTkColor):

tools/ttkDesigner/app/notepad.py

@@ -81,19 +81,19 @@ class NotePad(ttk.TTkGridLayout):
         fontLayout.addWidget(SuperSimpleHorizontalLine(),0,12,2,1)
 
         @ttk.pyTTkSlot(ttk.TTkColor)
-        def _currentColorChangedCB(format):
+        def _currentColorChangedCB(format:ttk.TTkColor):
-            if fg := format.foreground():
+            if ttk.TTkK.ColorType.Foreground & (colorType := format.colorType()):
                 cb_fg.setCheckState(ttk.TTkK.Checked)
                 btn_fgColor.setEnabled()
-                btn_fgColor.setColor(fg)
+                btn_fgColor.setColor(format.foreground())
             else:
                 cb_fg.setCheckState(ttk.TTkK.Unchecked)
                 btn_fgColor.setDisabled()
 
-            if bg := format.background():
+            if ttk.TTkK.ColorType.Background &  colorType:
                 cb_bg.setCheckState(ttk.TTkK.Checked)
                 btn_bgColor.setEnabled()
-                btn_bgColor.setColor(bg)
+                btn_bgColor.setColor(format.background())
             else:
                 cb_bg.setCheckState(ttk.TTkK.Unchecked)
                 btn_bgColor.setDisabled()