Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
21263438e5
4 changed files with 16 additions and 16 deletions
|
@ -182,7 +182,7 @@ def render_layout(layout_data, render_ascii, key_labels=None):
|
|||
|
||||
if x >= 0.25 and w == 1.25 and h == 2:
|
||||
render_key_isoenter(textpad, x, y, w, h, label, style)
|
||||
elif w == 2.25 and h == 2:
|
||||
elif w == 1.5 and h == 2:
|
||||
render_key_baenter(textpad, x, y, w, h, label, style)
|
||||
else:
|
||||
render_key_rect(textpad, x, y, w, h, label, style)
|
||||
|
@ -275,7 +275,7 @@ def render_key_baenter(textpad, x, y, w, h, label, style):
|
|||
w = ceil(w * 4)
|
||||
h = ceil(h * 3)
|
||||
|
||||
label_len = w - 2
|
||||
label_len = w + 1
|
||||
label_leftover = label_len - len(label)
|
||||
|
||||
if len(label) > label_len:
|
||||
|
@ -292,9 +292,9 @@ def render_key_baenter(textpad, x, y, w, h, label, style):
|
|||
lab_line = array('u', box_chars['v'] + label_middle + box_chars['v'])
|
||||
bot_line = array('u', box_chars['bl'] + label_border_bottom + box_chars['br'])
|
||||
|
||||
textpad[y][x + 3:x + w] = top_line
|
||||
textpad[y + 1][x + 3:x + w] = mid_line
|
||||
textpad[y + 2][x + 3:x + w] = mid_line
|
||||
textpad[y + 3][x:x + w] = crn_line
|
||||
textpad[y + 4][x:x + w] = lab_line
|
||||
textpad[y + 5][x:x + w] = bot_line
|
||||
textpad[y][x:x + w] = top_line
|
||||
textpad[y + 1][x:x + w] = mid_line
|
||||
textpad[y + 2][x:x + w] = mid_line
|
||||
textpad[y + 3][x - 3:x + w] = crn_line
|
||||
textpad[y + 4][x - 3:x + w] = lab_line
|
||||
textpad[y + 5][x - 3:x + w] = bot_line
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue