diff --git a/demo/showcase/_showcasehelper.py b/demo/showcase/_showcasehelper.py index 0c509503..32c580b2 100755 --- a/demo/showcase/_showcasehelper.py +++ b/demo/showcase/_showcasehelper.py @@ -21,13 +21,20 @@ # SOFTWARE. import sys, os, random +import platform sys.path.append(os.path.join(sys.path[0],'../..')) import TermTk as ttk -zc1 = chr(0x07a6) # Zero width chars oަ -zc2 = chr(0x20D7) # Zero width chars o⃗ -zc3 = chr(0x065f) # Zero width chars oٟ +if platform.system() == 'Windows': + # The windows terminals badly supports zero sized chars + zc1 = 'X' + zc2 = 'Y' + zc3 = 'Z' +else: + zc1 = chr(0x07a6) # Zero width chars oަ + zc2 = chr(0x20D7) # Zero width chars o⃗ + zc3 = chr(0x065f) # Zero width chars oٟ utfwords = [ f"--Zero{zc1}{zc2}{zc3}-1-", f"--Zero-2{zc1}{zc2}{zc3}-", f"--Ze{zc1}{zc2}{zc3}ro-3-", f"{zc1}{zc2}{zc3}--Zero-4-", "Lorem", "i🙻sum", "d😮l😱r", "sit", "am😎t,", "c😱nsectetur", "adi🙻iscing", "elit,", "sed", "do", "eiusmod", "t😜mpor", "incididunt", "ut", "labore", "et", "dolore", "magna", "aliqua.", "Ut", "enim", "ad", "minim", "veniam,", "quis", "nostrud", "exercitation", "ullamco", "laboris", "nisi", "ut", "aliq😞ip", "ex", "ea", "comm😞do", "cons😿quat.", "Duis", "aute", "irure", "dolor", "in", "reprehenderit", "in", "voluptate", "velit", "esse", "cillum", "dolore", "eu", "fugiat", "nulla", "pariatur.", "Excepteur", "sint", "occaecat", "cupidatat", "non", "proident,", "sunt", "in", "cul🙻a", "qui", "officia", "deserunt", "mollit", "anim", "id", "est", "laborum."] diff --git a/demo/showcase/formwidgets02.py b/demo/showcase/formwidgets02.py index ab99cab8..906fe3d0 100755 --- a/demo/showcase/formwidgets02.py +++ b/demo/showcase/formwidgets02.py @@ -29,7 +29,7 @@ sys.path.append(os.path.join(sys.path[0],'../..')) import TermTk as ttk sys.path.append(os.path.join(sys.path[0],'..')) -from showcase._showcasehelper import getUtfSentence +from showcase._showcasehelper import getUtfSentence, zc1 def demoFormWidgets(root=None): win_form1_grid_layout = ttk.TTkGridLayout(columnMinWidth=1) @@ -72,7 +72,7 @@ def demoFormWidgets(root=None): win_form1_grid_layout.addWidget(_wid := ttk.TTkLineEdit(text='Line Edit Test 2 😎 -'),row,2) win_form1_grid_layout.addWidget(_en_dis_cb := ttk.TTkCheckbox(text=" en/dis", checked=True),row,3); _en_dis_cb.clicked.connect(_wid.setEnabled) row += 1; win_form1_grid_layout.addWidget(ttk.TTkLabel(text='Line Edit Test 3'),row,0) - win_form1_grid_layout.addWidget(_wid := ttk.TTkLineEdit(text='Line Edit Test 3 oަ -'),row,2) + win_form1_grid_layout.addWidget(_wid := ttk.TTkLineEdit(text=f'Line Edit Test 3 o{zc1}-'),row,2) win_form1_grid_layout.addWidget(_en_dis_cb := ttk.TTkCheckbox(text=" en/dis", checked=True),row,3); _en_dis_cb.clicked.connect(_wid.setEnabled) row += 1; win_form1_grid_layout.addWidget(ttk.TTkLabel(text='Line Edit Input Number'),row,0) diff --git a/demo/showcase/textedit.py b/demo/showcase/textedit.py index 2a690f09..b8af2a8e 100755 --- a/demo/showcase/textedit.py +++ b/demo/showcase/textedit.py @@ -31,7 +31,7 @@ sys.path.append(os.path.join(sys.path[0],'../..')) import TermTk as ttk sys.path.append(os.path.join(sys.path[0],'..')) -from showcase._showcasehelper import getUtfColoredSentence +from showcase._showcasehelper import getUtfColoredSentence, zc1, zc2, zc3 class superSimpleHorizontalLine(ttk.TTkWidget): def paintEvent(self, canvas): @@ -74,10 +74,6 @@ def demoTextEdit(root=None, document=None): te.append( " |.|.|.|.|.||.|.|.||.|.|.") te.append("") - - zc1 = chr(0x07a6) - zc2 = chr(0x20D7) - zc3 = chr(0x065f) te.append( " - | | | | | -") te.append(f"Zero Size: - o{zc1} o{zc2} o{zc3} o{zc1}{zc2} o{zc1}{zc2}{zc3} -") te.append( " - | | | | | -")