mawei/StarPilot
1
0
Fork 0
mirror of https://github.com/firestar5683/StarPilot.git synced 2026-07-01 19:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

NavWidget: clean up names (#37481)

Browse Source 
* better names

* better names

* fix

* order

* rm!
This commit is contained in:
Shane Smiskol
2026-02-28 02:53:27 -08:00
committed by GitHub
parent 8f328f17fc
commit b5855bcade
5 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/mici/layouts/settings/device.py
+1 -1
View File
@@ -31,7 +31,7 @@ class MiciFccModal(NavWidget):
super().__init__()
self._content = HtmlRenderer(file_path=file_path, text=text)
self._scroll_panel = GuiScrollPanel2(horizontal=False)
self._scroll_panel.set_enabled(lambda: self.enabled and not self._swiping_away)
self._scroll_panel.set_enabled(lambda: self.enabled and not self._dragging_down)
self._fcc_logo = gui_app.texture("icons_mici/settings/device/fcc_logo.png", 76, 64)
def _render(self, rect: rl.Rectangle):
selfdrive/ui/mici/layouts/settings/firehose.py
+1 -1
View File
@@ -223,4 +223,4 @@ class FirehoseLayout(FirehoseLayoutBase, NavWidget):
def __init__(self):
super().__init__()
self._scroll_panel.set_enabled(lambda: self.enabled and not self._swiping_away)
self._scroll_panel.set_enabled(lambda: self.enabled and not self._dragging_down)
selfdrive/ui/mici/widgets/dialog.py
+2 -2
View File
@@ -77,7 +77,7 @@ class BigConfirmationDialogV2(BigDialogBase):
self._slider = RedBigSlider(title, icon_txt, confirm_callback=self._on_confirm)
else:
self._slider = BigSlider(title, icon_txt, confirm_callback=self._on_confirm)
self._slider.set_enabled(lambda: self.enabled and not self._swiping_away) # self.enabled for nav stack
self._slider.set_enabled(lambda: self.enabled and not self._dragging_down) # self.enabled for nav stack
def _on_confirm(self):
if self._exit_on_confirm:
@@ -87,7 +87,7 @@ class BigConfirmationDialogV2(BigDialogBase):
def _update_state(self):
super()._update_state()
if self._swiping_away and not self._slider.confirmed:
if self._dragging_down and not self._slider.confirmed:
self._slider.reset()
def _render(self, _):
system/ui/widgets/nav_widget.py
+37 -37
View File
@@ -55,16 +55,16 @@ class NavWidget(Widget, abc.ABC):
def __init__(self):
super().__init__()
self._back_button_start_pos: MousePos | None = None # cleared after certain amount of horizontal movement
self._swiping_away = False # currently swiping away
self._drag_start_pos: MousePos | None = None # cleared after certain amount of horizontal movement
self._dragging_down = False # swiped down enough to trigger dismissing on release
self._playing_dismiss_animation = False # released and animating away
self._y_pos_filter = BounceFilter(0.0, 0.1, 1 / gui_app.target_fps, bounce=1)
self._pos_filter = BounceFilter(0.0, 0.1, 1 / gui_app.target_fps, bounce=1)
self._playing_dismiss_animation = False
self._trigger_animate_in = False
self._nav_bar_show_time = 0.0
self._back_enabled: bool | Callable[[], bool] = True
self._nav_bar = NavBar()
self._nav_bar = NavBar()
self._nav_bar_show_time = 0.0
self._nav_bar_y_filter = FirstOrderFilter(0.0, 0.1, 1 / gui_app.target_fps)
@property
@@ -79,13 +79,13 @@ class NavWidget(Widget, abc.ABC):
super()._handle_mouse_event(mouse_event)
if not self.back_enabled:
self._back_button_start_pos = None
self._swiping_away = False
self._drag_start_pos = None
self._dragging_down = False
return
if mouse_event.left_pressed:
# user is able to swipe away if starting near top of screen, or anywhere if scroller is at top
self._pos_filter.update_alpha(0.04)
self._y_pos_filter.update_alpha(0.04)
in_dismiss_area = mouse_event.pos.y < self._rect.height * self.BACK_TOUCH_AREA_PERCENTAGE
# TODO: remove vertical scrolling and then this hacky logic to check if scroller is at top
@@ -101,37 +101,37 @@ class NavWidget(Widget, abc.ABC):
# Vertical scrollers need to be at the top to swipe away to prevent erroneous swipes
if (not vertical_scroller and in_dismiss_area) or scroller_at_top:
self._back_button_start_pos = mouse_event.pos
self._drag_start_pos = mouse_event.pos
elif mouse_event.left_down:
if self._back_button_start_pos is not None:
if self._drag_start_pos is not None:
# block swiping away if too much horizontal or upward movement
horizontal_movement = abs(mouse_event.pos.x - self._back_button_start_pos.x) > BLOCK_SWIPE_AWAY_THRESHOLD
upward_movement = mouse_event.pos.y - self._back_button_start_pos.y < -BLOCK_SWIPE_AWAY_THRESHOLD
horizontal_movement = abs(mouse_event.pos.x - self._drag_start_pos.x) > BLOCK_SWIPE_AWAY_THRESHOLD
upward_movement = mouse_event.pos.y - self._drag_start_pos.y < -BLOCK_SWIPE_AWAY_THRESHOLD
if not (horizontal_movement or upward_movement):
# no blocking movement, check if we should start dismissing
if mouse_event.pos.y - self._back_button_start_pos.y > START_DISMISSING_THRESHOLD:
self._swiping_away = True
if mouse_event.pos.y - self._drag_start_pos.y > START_DISMISSING_THRESHOLD:
self._dragging_down = True
else:
if not self._swiping_away:
self._back_button_start_pos = None
if not self._dragging_down:
self._drag_start_pos = None
elif mouse_event.left_released:
self._pos_filter.update_alpha(0.1)
self._y_pos_filter.update_alpha(0.1)
# if far enough, trigger back navigation callback
if self._back_button_start_pos is not None:
if mouse_event.pos.y - self._back_button_start_pos.y > SWIPE_AWAY_THRESHOLD:
if self._drag_start_pos is not None:
if mouse_event.pos.y - self._drag_start_pos.y > SWIPE_AWAY_THRESHOLD:
self._playing_dismiss_animation = True
self._back_button_start_pos = None
self._swiping_away = False
self._drag_start_pos = None
self._dragging_down = False
def _update_state(self):
super()._update_state()
if self._trigger_animate_in:
self._pos_filter.x = self._rect.height
self._y_pos_filter.x = self._rect.height
self._nav_bar_y_filter.x = -NAV_BAR_MARGIN - NAV_BAR_HEIGHT
self._nav_bar_show_time = rl.get_time()
self._trigger_animate_in = False
@@ -139,32 +139,32 @@ class NavWidget(Widget, abc.ABC):
new_y = 0.0
if not self.enabled:
self._back_button_start_pos = None
self._drag_start_pos = None
# TODO: why is this not in handle_mouse_event? have to hack above
if self._back_button_start_pos is not None:
if self._drag_start_pos is not None:
last_mouse_event = gui_app.last_mouse_event
# push entire widget as user drags it away
new_y = max(last_mouse_event.pos.y - self._back_button_start_pos.y, 0)
new_y = max(last_mouse_event.pos.y - self._drag_start_pos.y, 0)
if new_y < SWIPE_AWAY_THRESHOLD:
new_y /= 2 # resistance until mouse release would dismiss widget
if self._swiping_away:
if self._dragging_down:
self._nav_bar.set_alpha(1.0)
if self._playing_dismiss_animation:
new_y = self._rect.height + DISMISS_PUSH_OFFSET
new_y = round(self._pos_filter.update(new_y))
if abs(new_y) < 1 and self._pos_filter.velocity.x == 0.0:
new_y = self._pos_filter.x = 0.0
new_y = round(self._y_pos_filter.update(new_y))
if abs(new_y) < 1 and self._y_pos_filter.velocity.x == 0.0:
new_y = self._y_pos_filter.x = 0.0
if new_y > self._rect.height + DISMISS_PUSH_OFFSET - 10:
gui_app.pop_widget()
self._playing_dismiss_animation = False
self._back_button_start_pos = None
self._swiping_away = False
self._drag_start_pos = None
self._dragging_down = False
self.set_position(self._rect.x, new_y)
@@ -183,8 +183,8 @@ class NavWidget(Widget, abc.ABC):
bar_x = self._rect.x + (self._rect.width - self._nav_bar.rect.width) / 2
nav_bar_delayed = rl.get_time() - self._nav_bar_show_time < 0.4
# User dragging or dismissing, nav bar follows NavWidget
if self._back_button_start_pos is not None or self._playing_dismiss_animation:
self._nav_bar_y_filter.x = NAV_BAR_MARGIN + self._pos_filter.x
if self._drag_start_pos is not None or self._playing_dismiss_animation:
self._nav_bar_y_filter.x = NAV_BAR_MARGIN + self._y_pos_filter.x
# Waiting to show
elif nav_bar_delayed:
self._nav_bar_y_filter.x = -NAV_BAR_MARGIN - NAV_BAR_HEIGHT
@@ -205,6 +205,6 @@ class NavWidget(Widget, abc.ABC):
self._nav_bar.show_event()
# Reset state
self._pos_filter.update_alpha(0.1)
self._back_button_start_pos = None
self._swiping_away = False
self._y_pos_filter.update_alpha(0.1)
self._drag_start_pos = None
self._dragging_down = False
system/ui/widgets/scroller.py
+1 -1
View File
@@ -443,4 +443,4 @@ class NavScroller(NavWidget, Scroller):
def __init__(self, **kwargs):
super().__init__(**kwargs)
# pass down enabled to child widget for nav stack + disable while swiping away NavWidget
self._scroller.set_enabled(lambda: self.enabled and not self._swiping_away)
self._scroller.set_enabled(lambda: self.enabled and not self._dragging_down)