m5/MicroPythonOS
0
0
Fork 0
mirror of https://github.com/m5stack/MicroPythonOS.git synced 2026-05-20 11:51:27 -07:00
Code Issues Packages Projects Releases Wiki Activity

Simplify keyboard, robustify animations

Browse Source
This commit is contained in:
Thomas Farstrike
2025-11-15 22:32:21 +01:00
parent dce55f7918
commit b062aa00e3
4 changed files with 418 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal_filesystem/lib/mpos/ui/anim.py
+38 -12
View File
@@ -1,5 +1,31 @@
import lvgl as lv
def safe_widget_access(callback):
"""
Wrapper to safely access a widget, catching LvReferenceError.
If the widget has been deleted, the callback is silently skipped.
This prevents crashes when animations try to access deleted widgets.
Args:
callback: Function to call (should access a widget)
Returns:
None (always, even if callback returns a value)
"""
try:
callback()
except Exception as e:
# Check if it's an LvReferenceError (widget was deleted)
if "LvReferenceError" in str(type(e).__name__) or "Referenced object was deleted" in str(e):
# Widget was deleted - silently ignore
pass
else:
# Some other error - re-raise it
raise
class WidgetAnimator:
# def __init__(self):
@@ -27,10 +53,10 @@ class WidgetAnimator:
anim.set_values(0, 255)
anim.set_duration(duration)
anim.set_delay(delay)
anim.set_custom_exec_cb(lambda anim, value: widget.set_style_opa(value, 0))
anim.set_custom_exec_cb(lambda anim, value: safe_widget_access(lambda: widget.set_style_opa(value, 0)))
anim.set_path_cb(lv.anim_t.path_ease_in_out)
# Ensure opacity is reset after animation
anim.set_completed_cb(lambda *args: widget.set_style_opa(255, 0))
anim.set_completed_cb(lambda *args: safe_widget_access(lambda: widget.set_style_opa(255, 0)))
elif anim_type == "slide_down":
print("doing slide_down")
# Create slide-down animation (y from -height to original y)
@@ -42,10 +68,10 @@ class WidgetAnimator:
anim.set_values(original_y - height, original_y)
anim.set_duration(duration)
anim.set_delay(delay)
anim.set_custom_exec_cb(lambda anim, value: widget.set_y(value))
anim.set_custom_exec_cb(lambda anim, value: safe_widget_access(lambda: widget.set_y(value)))
anim.set_path_cb(lv.anim_t.path_ease_in_out)
# Reset y position after animation
anim.set_completed_cb(lambda *args: widget.set_y(original_y))
anim.set_completed_cb(lambda *args: safe_widget_access(lambda: widget.set_y(original_y)))
elif anim_type == "slide_up":
# Create slide-up animation (y from +height to original y)
# Seems to cause scroll bars to be added somehow if done to a keyboard at the bottom of the screen...
@@ -57,10 +83,10 @@ class WidgetAnimator:
anim.set_values(original_y + height, original_y)
anim.set_duration(duration)
anim.set_delay(delay)
anim.set_custom_exec_cb(lambda anim, value: widget.set_y(value))
anim.set_custom_exec_cb(lambda anim, value: safe_widget_access(lambda: widget.set_y(value)))
anim.set_path_cb(lv.anim_t.path_ease_in_out)
# Reset y position after animation
anim.set_completed_cb(lambda *args: widget.set_y(original_y))
anim.set_completed_cb(lambda *args: safe_widget_access(lambda: widget.set_y(original_y)))
# Store and start animation
#self.animations[widget] = anim
@@ -77,10 +103,10 @@ class WidgetAnimator:
anim.set_values(255, 0)
anim.set_duration(duration)
anim.set_delay(delay)
anim.set_custom_exec_cb(lambda anim, value: widget.set_style_opa(value, 0))
anim.set_custom_exec_cb(lambda anim, value: safe_widget_access(lambda: widget.set_style_opa(value, 0)))
anim.set_path_cb(lv.anim_t.path_ease_in_out)
# Set HIDDEN flag after animation
anim.set_completed_cb(lambda *args: WidgetAnimator.hide_complete_cb(widget, hide=hide))
anim.set_completed_cb(lambda *args: safe_widget_access(lambda: WidgetAnimator.hide_complete_cb(widget, hide=hide)))
elif anim_type == "slide_down":
# Create slide-down animation (y from original y to +height)
# Seems to cause scroll bars to be added somehow if done to a keyboard at the bottom of the screen...
@@ -92,10 +118,10 @@ class WidgetAnimator:
anim.set_values(original_y, original_y + height)
anim.set_duration(duration)
anim.set_delay(delay)
anim.set_custom_exec_cb(lambda anim, value: widget.set_y(value))
anim.set_custom_exec_cb(lambda anim, value: safe_widget_access(lambda: widget.set_y(value)))
anim.set_path_cb(lv.anim_t.path_ease_in_out)
# Set HIDDEN flag after animation
anim.set_completed_cb(lambda *args: WidgetAnimator.hide_complete_cb(widget, original_y, hide))
anim.set_completed_cb(lambda *args: safe_widget_access(lambda: WidgetAnimator.hide_complete_cb(widget, original_y, hide)))
elif anim_type == "slide_up":
print("hide with slide_up")
# Create slide-up animation (y from original y to -height)
@@ -107,10 +133,10 @@ class WidgetAnimator:
anim.set_values(original_y, original_y - height)
anim.set_duration(duration)
anim.set_delay(delay)
anim.set_custom_exec_cb(lambda anim, value: widget.set_y(value))
anim.set_custom_exec_cb(lambda anim, value: safe_widget_access(lambda: widget.set_y(value)))
anim.set_path_cb(lv.anim_t.path_ease_in_out)
# Set HIDDEN flag after animation
anim.set_completed_cb(lambda *args: WidgetAnimator.hide_complete_cb(widget, original_y, hide))
anim.set_completed_cb(lambda *args: safe_widget_access(lambda: WidgetAnimator.hide_complete_cb(widget, original_y, hide)))
# Store and start animation
#self.animations[widget] = anim
internal_filesystem/lib/mpos/ui/keyboard.py
+17 -83
View File
@@ -179,98 +179,32 @@ class CustomKeyboard:
ta.set_text(new_text)
# ========================================================================
# LVGL keyboard-compatible API
# Python magic method for automatic method forwarding
# ========================================================================
def set_textarea(self, textarea):
"""Set the textarea that this keyboard should edit."""
self._keyboard.set_textarea(textarea)
def __getattr__(self, name):
"""
Forward any undefined method/attribute to the underlying LVGL keyboard.
def get_textarea(self):
"""Get the currently associated textarea."""
return self._keyboard.get_textarea()
This allows CustomKeyboard to support ALL lv.keyboard methods automatically
without needing to manually wrap each one. Any method not defined on
CustomKeyboard will be forwarded to self._keyboard.
def set_mode(self, mode):
"""Set keyboard mode (use MODE_* constants)."""
self._keyboard.set_mode(mode)
def align(self, align_type, x_offset=0, y_offset=0):
"""Align the keyboard."""
self._keyboard.align(align_type, x_offset, y_offset)
def set_style_min_height(self, height, selector):
"""Set minimum height."""
self._keyboard.set_style_min_height(height, selector)
def set_style_height(self, height, selector):
"""Set height."""
self._keyboard.set_style_height(height, selector)
def set_style_max_height(self, height, selector):
"""Set maximum height."""
self._keyboard.set_style_max_height(height, selector)
def set_style_opa(self, opacity, selector):
"""Set opacity (required for fade animations)."""
self._keyboard.set_style_opa(opacity, selector)
def get_x(self):
"""Get X position."""
return self._keyboard.get_x()
def set_x(self, x):
"""Set X position."""
self._keyboard.set_x(x)
def get_y(self):
"""Get Y position."""
return self._keyboard.get_y()
def set_y(self, y):
"""Set Y position."""
self._keyboard.set_y(y)
def set_pos(self, x, y):
"""Set position."""
self._keyboard.set_pos(x, y)
def get_height(self):
"""Get height."""
return self._keyboard.get_height()
def get_width(self):
"""Get width."""
return self._keyboard.get_width()
def add_flag(self, flag):
"""Add object flag (e.g., HIDDEN)."""
self._keyboard.add_flag(flag)
def remove_flag(self, flag):
"""Remove object flag."""
self._keyboard.remove_flag(flag)
def has_flag(self, flag):
"""Check if object has flag."""
return self._keyboard.has_flag(flag)
def add_event_cb(self, callback, event_code, user_data):
"""Add event callback."""
self._keyboard.add_event_cb(callback, event_code, user_data)
def remove_event_cb(self, callback):
"""Remove event callback."""
self._keyboard.remove_event_cb(callback)
def send_event(self, event_code, param):
"""Send event to keyboard."""
self._keyboard.send_event(event_code, param)
Examples:
keyboard.set_textarea(ta) # Works
keyboard.align(lv.ALIGN.CENTER) # Works
keyboard.set_style_opa(128, 0) # Works
keyboard.any_lvgl_method() # Works!
"""
# Forward to the underlying keyboard object
return getattr(self._keyboard, name)
def get_lvgl_obj(self):
"""
Get the underlying LVGL keyboard object.
Use this if you need direct access to LVGL methods not wrapped here.
This is now rarely needed since __getattr__ forwards everything automatically.
Kept for backwards compatibility.
"""
return self._keyboard