Skip to content

fix(keyboard): fix the vibration issue with the DEL button #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
somebodyLi merged 1 commit into from
Jul 29, 2025
Merged

fix(keyboard): fix the vibration issue with the DEL button #372

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions core/src/trezor/lvglui/scrs/components/keyboard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ def __init__(self, parent, is_slip39: bool = False):
self.set_popovers(True)
self.set_textarea(self.ta)
self.add_event_cb(self.event_cb, lv.EVENT.PRESSED, None)
self.add_event_cb(self.event_cb, lv.EVENT.LONG_PRESSED, None)
self.add_event_cb(self.event_cb, lv.EVENT.DRAW_PART_BEGIN, None)
self.add_event_cb(self.event_cb, lv.EVENT.VALUE_CHANGED, None)
self.mnemonic_prompt = lv.obj(parent)
Expand All @@ -259,6 +260,7 @@ def __init__(self, parent, is_slip39: bool = False):
self.mnemonic_prompt.add_event_cb(self.on_click, lv.EVENT.CLICKED, None)
self.mnemonic_prompt.add_event_cb(self.on_click, lv.EVENT.PRESSED, None)
self.move_foreground()
self.vibrated = False

def tip_submitted(self):
self.tip_panel = lv.obj(self.parent)
Expand Down Expand Up @@ -316,7 +318,10 @@ def event_cb(self, event):
):
return
motor.vibrate()
self.vibrated = True
return
elif code == lv.EVENT.LONG_PRESSED:
self.vibrated = False
if code == lv.EVENT.DRAW_PART_BEGIN:
txt_input = self.ta.get_text()
dsc = lv.obj_draw_part_dsc_t.__cast__(event.get_param())
Expand All @@ -328,7 +333,7 @@ def event_cb(self, event):
# dsc.rect_dsc.bg_color = lv_colors.BLACK
elif code == lv.EVENT.VALUE_CHANGED:
utils.lcd_resume()
if isinstance(target, lv.keyboard):
if isinstance(target, lv.keyboard) and not self.vibrated:
btn_id = target.get_selected_btn()
if btn_id == 21:
motor.vibrate()
Expand Down Expand Up @@ -524,11 +529,13 @@ def __init__(self, parent, max_len: int = 50, min_len: int = 4) -> None:
self.input_count_tips.add_flag(lv.obj.FLAG.HIDDEN)

self.add_event_cb(self.event_cb, lv.EVENT.PRESSED, None)
self.add_event_cb(self.event_cb, lv.EVENT.LONG_PRESSED, None)
self.add_event_cb(self.event_cb, lv.EVENT.DRAW_PART_BEGIN, None)
self.add_event_cb(self.event_cb, lv.EVENT.VALUE_CHANGED, None)
self.add_event_cb(self.event_cb, lv.EVENT.READY, None)
self.add_event_cb(self.event_cb, lv.EVENT.CANCEL, None)
self.previous_input_len = 0
self.vibrated = False

def update_count_tips(self):
"""Update/show tips only when input length larger than 10"""
Expand Down Expand Up @@ -581,7 +588,10 @@ def event_cb(self, event):
):
return
motor.vibrate()
self.vibrated = True
return
elif code == lv.EVENT.LONG_PRESSED:
self.vibrated = False
input_len = len(self.ta.get_text())
self.input_len = input_len
self.ta.clear_flag(lv.obj.FLAG.HIDDEN)
Expand All @@ -598,7 +608,7 @@ def event_cb(self, event):
# dsc.rect_dsc.bg_img_src = "A:/res/keyboard-close.png"
elif code == lv.EVENT.VALUE_CHANGED:
utils.lcd_resume()
if isinstance(target, lv.keyboard):
if isinstance(target, lv.keyboard) and not self.vibrated:
btn_id = target.get_selected_btn()
if btn_id == 9:
motor.vibrate()
Expand Down Expand Up @@ -751,11 +761,13 @@ def __init__(
# self.input_count_tips.add_flag(lv.obj.FLAG.HIDDEN)

self.add_event_cb(self.event_cb, lv.EVENT.PRESSED, None)
self.add_event_cb(self.event_cb, lv.EVENT.LONG_PRESSED, None)
self.add_event_cb(self.event_cb, lv.EVENT.DRAW_PART_BEGIN, None)
self.add_event_cb(self.event_cb, lv.EVENT.VALUE_CHANGED, None)
self.add_event_cb(self.event_cb, lv.EVENT.READY, None)
self.add_event_cb(self.event_cb, lv.EVENT.CANCEL, None)
self.previous_input_len = 0
self.vibrated = False

# def update_count_tips(self):
# """Update/show tips only when input length larger than 10"""
Expand Down Expand Up @@ -821,7 +833,10 @@ def event_cb(self, event):
):
return
motor.vibrate()
self.vibrated = True
return
elif code == lv.EVENT.LONG_PRESSED:
self.vibrated = False
if not self.is_pin and text.startswith("#"):
input_len = len(text) - 1
else:
Expand Down Expand Up @@ -850,7 +865,7 @@ def event_cb(self, event):

elif code == lv.EVENT.VALUE_CHANGED:
utils.lcd_resume()
if isinstance(target, lv.keyboard):
if isinstance(target, lv.keyboard) and not self.vibrated:
btn_id = target.get_selected_btn()
if btn_id == 9:
motor.vibrate()
Expand Down Expand Up @@ -1133,6 +1148,7 @@ def __init__(self, parent, max_len, min_len=0) -> None:

self.update_count_tips()
self.add_event_cb(self.event_cb, lv.EVENT.PRESSED, None)
self.add_event_cb(self.event_cb, lv.EVENT.LONG_PRESSED, None)
self.add_event_cb(self.event_cb, lv.EVENT.DRAW_PART_BEGIN, None)
self.add_event_cb(self.event_cb, lv.EVENT.VALUE_CHANGED, None)
self.ta.add_event_cb(self.event_cb, lv.EVENT.FOCUSED, None)
Expand Down Expand Up @@ -1167,7 +1183,10 @@ def event_cb(self, event):
if btn_id == 31 and len(self.ta.get_text()) == 0:
return
motor.vibrate()
self.vibrated = True
return
elif code == lv.EVENT.LONG_PRESSED:
self.vibrated = False
if code == lv.EVENT.DRAW_PART_BEGIN:
txt_input = self.ta.get_text()
dsc = lv.obj_draw_part_dsc_t.__cast__(event.get_param())
Expand Down Expand Up @@ -1222,7 +1241,8 @@ def event_cb(self, event):
self.ta.del_char()
self.update_count_tips()
self.update_ok_button_state()
motor.vibrate()
if not self.vibrated:
motor.vibrate()
return
elif text == lv.SYMBOL.OK:
if len(self.ta.get_text()) >= self.min_len:
Expand Down
Loading