ui: split out NavWidget (#37312)

* spliit

* fix

* fix imports

selfdrive/ui/mici/layouts/onboarding.py

@@ -7,7 +7,8 @@ import pyray as rl
 from openpilot.common.filter_simple import FirstOrderFilter
 from openpilot.system.hardware import HARDWARE
 from openpilot.system.ui.lib.application import FontWeight, gui_app
-from openpilot.system.ui.widgets import Widget, NavWidget
+from openpilot.system.ui.widgets import Widget
+from openpilot.system.ui.widgets.nav_widget import NavWidget
 from openpilot.system.ui.widgets.button import SmallButton, SmallCircleIconButton
 from openpilot.system.ui.widgets.label import UnifiedLabel
 from openpilot.system.ui.widgets.slider import SmallSlider

selfdrive/ui/mici/layouts/settings/developer.py

@@ -5,7 +5,7 @@ from openpilot.system.ui.widgets.scroller import Scroller
 from openpilot.selfdrive.ui.mici.widgets.button import BigButton, BigToggle, BigParamControl, BigCircleParamControl
 from openpilot.selfdrive.ui.mici.widgets.dialog import BigDialog, BigInputDialog
 from openpilot.system.ui.lib.application import gui_app
-from openpilot.system.ui.widgets import NavWidget
+from openpilot.system.ui.widgets.nav_widget import NavWidget
 from openpilot.selfdrive.ui.layouts.settings.common import restart_needed_callback
 from openpilot.selfdrive.ui.ui_state import ui_state
 from openpilot.selfdrive.ui.widgets.ssh_key import SshKeyAction

selfdrive/ui/mici/layouts/settings/device.py

@@ -16,7 +16,8 @@ from openpilot.selfdrive.ui.mici.onroad.driver_camera_dialog import DriverCamera
 from openpilot.selfdrive.ui.mici.layouts.onboarding import TrainingGuide
 from openpilot.system.ui.lib.application import gui_app, FontWeight, MousePos
 from openpilot.system.ui.lib.multilang import tr
-from openpilot.system.ui.widgets import Widget, NavWidget
+from openpilot.system.ui.widgets import Widget
+from openpilot.system.ui.widgets.nav_widget import NavWidget
 from openpilot.selfdrive.ui.ui_state import ui_state
 from openpilot.system.ui.widgets.label import MiciLabel
 from openpilot.system.ui.widgets.html_render import HtmlModal, HtmlRenderer

selfdrive/ui/mici/layouts/settings/firehose.py

@@ -13,7 +13,8 @@ from openpilot.system.ui.lib.application import gui_app, FontWeight, FONT_SCALE
 from openpilot.system.ui.lib.wrap_text import wrap_text
 from openpilot.system.ui.lib.scroll_panel2 import GuiScrollPanel2
 from openpilot.system.ui.lib.multilang import tr, trn, tr_noop
-from openpilot.system.ui.widgets import Widget, NavWidget
+from openpilot.system.ui.widgets import Widget
+from openpilot.system.ui.widgets.nav_widget import NavWidget
 
 TITLE = tr_noop("Firehose Mode")
 DESCRIPTION = tr_noop(

selfdrive/ui/mici/layouts/settings/network/__init__.py

@@ -7,7 +7,7 @@ from openpilot.selfdrive.ui.mici.widgets.dialog import BigInputDialog
 from openpilot.selfdrive.ui.ui_state import ui_state
 from openpilot.selfdrive.ui.lib.prime_state import PrimeType
 from openpilot.system.ui.lib.application import gui_app
-from openpilot.system.ui.widgets import NavWidget
+from openpilot.system.ui.widgets.nav_widget import NavWidget
 from openpilot.system.ui.lib.wifi_manager import WifiManager, Network, MeteredType, ConnectStatus, normalize_ssid
 
 

selfdrive/ui/mici/layouts/settings/network/wifi_ui.py

@@ -7,7 +7,8 @@ from openpilot.common.swaglog import cloudlog
 from openpilot.system.ui.widgets.label import UnifiedLabel
 from openpilot.selfdrive.ui.mici.widgets.dialog import BigMultiOptionDialog, BigInputDialog, BigDialogOptionButton, BigConfirmationDialogV2
 from openpilot.system.ui.lib.application import gui_app, MousePos, FontWeight
-from openpilot.system.ui.widgets import Widget, NavWidget
+from openpilot.system.ui.widgets import Widget
+from openpilot.system.ui.widgets.nav_widget import NavWidget
 from openpilot.system.ui.lib.wifi_manager import WifiManager, Network, SecurityType, WifiState, normalize_ssid
 
 

selfdrive/ui/mici/layouts/settings/settings.py

@@ -9,7 +9,7 @@ from openpilot.selfdrive.ui.mici.layouts.settings.device import DeviceLayoutMici
 from openpilot.selfdrive.ui.mici.layouts.settings.developer import DeveloperLayoutMici
 from openpilot.selfdrive.ui.mici.layouts.settings.firehose import FirehoseLayout
 from openpilot.system.ui.lib.application import gui_app, FontWeight
-from openpilot.system.ui.widgets import NavWidget
+from openpilot.system.ui.widgets.nav_widget import NavWidget
 
 
 class SettingsBigButton(BigButton):

selfdrive/ui/mici/layouts/settings/toggles.py

@@ -4,7 +4,7 @@ from cereal import log
 from openpilot.system.ui.widgets.scroller import Scroller
 from openpilot.selfdrive.ui.mici.widgets.button import BigParamControl, BigMultiParamToggle
 from openpilot.system.ui.lib.application import gui_app
-from openpilot.system.ui.widgets import NavWidget
+from openpilot.system.ui.widgets.nav_widget import NavWidget
 from openpilot.selfdrive.ui.layouts.settings.common import restart_needed_callback
 from openpilot.selfdrive.ui.ui_state import ui_state
 

selfdrive/ui/mici/onroad/driver_camera_dialog.py

@@ -7,7 +7,7 @@ from openpilot.selfdrive.ui.ui_state import ui_state, device
 from openpilot.selfdrive.selfdrived.events import EVENTS, ET
 from openpilot.system.ui.lib.application import gui_app, FontWeight
 from openpilot.system.ui.lib.multilang import tr
-from openpilot.system.ui.widgets import NavWidget
+from openpilot.system.ui.widgets.nav_widget import NavWidget
 from openpilot.system.ui.widgets.label import gui_label
 
 EventName = log.OnroadEvent.EventName

selfdrive/ui/mici/widgets/dialog.py

@@ -4,7 +4,8 @@ import pyray as rl
 from typing import Union
 from collections.abc import Callable
 from typing import cast
-from openpilot.system.ui.widgets import Widget, NavWidget
+from openpilot.system.ui.widgets import Widget
+from openpilot.system.ui.widgets.nav_widget import NavWidget
 from openpilot.system.ui.widgets.label import UnifiedLabel, gui_label
 from openpilot.system.ui.widgets.mici_keyboard import MiciKeyboard
 from openpilot.system.ui.lib.text_measure import measure_text_cached

selfdrive/ui/mici/widgets/pairing_dialog.py

@@ -7,7 +7,7 @@ from openpilot.common.api import Api
 from openpilot.common.swaglog import cloudlog
 from openpilot.common.params import Params
 from openpilot.selfdrive.ui.ui_state import ui_state
-from openpilot.system.ui.widgets import NavWidget
+from openpilot.system.ui.widgets.nav_widget import NavWidget
 from openpilot.system.ui.lib.application import FontWeight, gui_app
 from openpilot.system.ui.widgets.label import MiciLabel
 

system/ui/widgets/__init__.py

@@ -4,7 +4,6 @@ import abc
 import pyray as rl
 from enum import IntEnum
 from collections.abc import Callable
-from openpilot.common.filter_simple import BounceFilter, FirstOrderFilter
 from openpilot.system.ui.lib.application import gui_app, MousePos, MAX_TOUCH_SLOTS, MouseEvent
 
 try:
@@ -189,223 +188,3 @@ class Widget(abc.ABC):
 
   def hide_event(self):
     """Optionally handle hide event. Parent must manually call this"""
-
-
-SWIPE_AWAY_THRESHOLD = 80  # px to dismiss after releasing
-START_DISMISSING_THRESHOLD = 40  # px to start dismissing while dragging
-BLOCK_SWIPE_AWAY_THRESHOLD = 60  # px horizontal movement to block swipe away
-
-NAV_BAR_MARGIN = 6
-NAV_BAR_WIDTH = 205
-NAV_BAR_HEIGHT = 8
-
-DISMISS_PUSH_OFFSET = 50 + NAV_BAR_MARGIN + NAV_BAR_HEIGHT  # px extra to push down when dismissing
-DISMISS_TIME_SECONDS = 2.0
-
-
-class NavBar(Widget):
-  def __init__(self):
-    super().__init__()
-    self.set_rect(rl.Rectangle(0, 0, NAV_BAR_WIDTH, NAV_BAR_HEIGHT))
-    self._alpha = 1.0
-    self._alpha_filter = FirstOrderFilter(1.0, 0.1, 1 / gui_app.target_fps)
-    self._fade_time = 0.0
-
-  def set_alpha(self, alpha: float) -> None:
-    self._alpha = alpha
-    self._fade_time = rl.get_time()
-
-  def show_event(self):
-    super().show_event()
-    self._alpha = 1.0
-    self._alpha_filter.x = 1.0
-    self._fade_time = rl.get_time()
-
-  def _render(self, _):
-    if rl.get_time() - self._fade_time > DISMISS_TIME_SECONDS:
-      self._alpha = 0.0
-    alpha = self._alpha_filter.update(self._alpha)
-
-    # white bar with black border
-    rl.draw_rectangle_rounded(self._rect, 1.0, 6, rl.Color(255, 255, 255, int(255 * 0.9 * alpha)))
-    rl.draw_rectangle_rounded_lines_ex(self._rect, 1.0, 6, 2, rl.Color(0, 0, 0, int(255 * 0.3 * alpha)))
-
-
-class NavWidget(Widget, abc.ABC):
-  """
-  A full screen widget that supports back navigation by swiping down from the top.
-  """
-  BACK_TOUCH_AREA_PERCENTAGE = 0.65
-
-  def __init__(self):
-    super().__init__()
-    self._back_callback: Callable[[], None] | None = None
-    self._back_button_start_pos: MousePos | None = None
-    self._swiping_away = False  # currently swiping away
-    self._can_swipe_away = True  # swipe away is blocked after certain horizontal movement
-
-    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_y_filter = FirstOrderFilter(0.0, 0.1, 1 / gui_app.target_fps)
-
-    self._set_up = False
-
-  @property
-  def back_enabled(self) -> bool:
-    return self._back_enabled() if callable(self._back_enabled) else self._back_enabled
-
-  def set_back_enabled(self, enabled: bool | Callable[[], bool]) -> None:
-    self._back_enabled = enabled
-
-  def set_back_callback(self, callback: Callable[[], None]) -> None:
-    self._back_callback = callback
-
-  def _handle_mouse_event(self, mouse_event: MouseEvent) -> None:
-    # FIXME: disabling this widget on new push_widget still causes this widget to track mouse events without mouse down
-    super()._handle_mouse_event(mouse_event)
-
-    if not self.back_enabled:
-      self._back_button_start_pos = None
-      self._swiping_away = False
-      self._can_swipe_away = True
-      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)
-      in_dismiss_area = mouse_event.pos.y < self._rect.height * self.BACK_TOUCH_AREA_PERCENTAGE
-
-      scroller_at_top = False
-      vertical_scroller = False
-      # TODO: -20? snapping in WiFi dialog can make offset not be positive at the top
-      if hasattr(self, '_scroller'):
-        scroller_at_top = self._scroller.scroll_panel.get_offset() >= -20 and not self._scroller._horizontal
-        vertical_scroller = not self._scroller._horizontal
-      elif hasattr(self, '_scroll_panel'):
-        scroller_at_top = self._scroll_panel.get_offset() >= -20 and not self._scroll_panel._horizontal
-        vertical_scroller = not self._scroll_panel._horizontal
-
-      # 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._can_swipe_away = True
-        self._back_button_start_pos = mouse_event.pos
-
-    elif mouse_event.left_down:
-      if self._back_button_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
-        if not self._swiping_away and (horizontal_movement or upward_movement):
-          self._can_swipe_away = False
-          self._back_button_start_pos = None
-
-        # block horizontal swiping if now swiping away
-        if self._can_swipe_away:
-          if mouse_event.pos.y - self._back_button_start_pos.y > START_DISMISSING_THRESHOLD:
-            self._swiping_away = True
-
-    elif mouse_event.left_released:
-      self._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:
-          self._playing_dismiss_animation = True
-
-      self._back_button_start_pos = None
-      self._swiping_away = False
-
-  def _update_state(self):
-    super()._update_state()
-
-    # Disable self's scroller while swiping away
-    if not self._set_up:
-      self._set_up = True
-      if hasattr(self, '_scroller'):
-        # TODO: use touch_valid
-        original_enabled = self._scroller._enabled
-        self._scroller.set_enabled(lambda: self.enabled and not self._swiping_away and (original_enabled() if callable(original_enabled) else
-                                                                                        original_enabled))
-      elif hasattr(self, '_scroll_panel'):
-        original_enabled = self._scroll_panel.enabled
-        self._scroll_panel.set_enabled(lambda: self.enabled and not self._swiping_away and (original_enabled() if callable(original_enabled) else
-                                                                                            original_enabled))
-
-    if self._trigger_animate_in:
-      self._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
-
-    new_y = 0.0
-
-    if not self.enabled:
-      self._back_button_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:
-      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)
-      if new_y < SWIPE_AWAY_THRESHOLD:
-        new_y /= 2  # resistance until mouse release would dismiss widget
-
-    if self._swiping_away:
-      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
-
-    if new_y > self._rect.height + DISMISS_PUSH_OFFSET - 10:
-      if self._back_callback is not None:
-        self._back_callback()
-
-      self._playing_dismiss_animation = False
-      self._back_button_start_pos = None
-      self._swiping_away = False
-
-    self.set_position(self._rect.x, new_y)
-
-  def _layout(self):
-    # Dim whatever is behind this widget, fading with position (runs after _update_state so position is correct)
-    overlay_alpha = int(200 * max(0.0, min(1.0, 1.0 - self._rect.y / self._rect.height))) if self._rect.height > 0 else 0
-    rl.draw_rectangle(0, 0, int(self._rect.width), int(self._rect.height), rl.Color(0, 0, 0, overlay_alpha))
-
-    bounce_height = 20
-    rl.draw_rectangle(int(self._rect.x), int(self._rect.y), int(self._rect.width), int(self._rect.height + bounce_height), rl.BLACK)
-
-  def render(self, rect: rl.Rectangle | None = None) -> bool | int | None:
-    ret = super().render(rect)
-
-    if self.back_enabled:
-      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
-      # Waiting to show
-      elif nav_bar_delayed:
-        self._nav_bar_y_filter.x = -NAV_BAR_MARGIN - NAV_BAR_HEIGHT
-      # Animate back to top
-      else:
-        self._nav_bar_y_filter.update(NAV_BAR_MARGIN)
-
-      self._nav_bar.set_position(bar_x, round(self._nav_bar_y_filter.x))
-      self._nav_bar.render()
-
-    return ret
-
-  def show_event(self):
-    super().show_event()
-    # FIXME: we don't know the height of the rect at first show_event since it's before the first render :(
-    #  so we need this hacky bool for now
-    self._trigger_animate_in = True
-    self._nav_bar.show_event()

system/ui/widgets/nav_widget.py

@@ -0,0 +1,227 @@
+from __future__ import annotations
+
+import abc
+import pyray as rl
+from collections.abc import Callable
+from openpilot.system.ui.widgets import Widget
+from openpilot.common.filter_simple import BounceFilter, FirstOrderFilter
+from openpilot.system.ui.lib.application import gui_app, MousePos, MouseEvent
+
+SWIPE_AWAY_THRESHOLD = 80  # px to dismiss after releasing
+START_DISMISSING_THRESHOLD = 40  # px to start dismissing while dragging
+BLOCK_SWIPE_AWAY_THRESHOLD = 60  # px horizontal movement to block swipe away
+
+NAV_BAR_MARGIN = 6
+NAV_BAR_WIDTH = 205
+NAV_BAR_HEIGHT = 8
+
+DISMISS_PUSH_OFFSET = 50 + NAV_BAR_MARGIN + NAV_BAR_HEIGHT  # px extra to push down when dismissing
+DISMISS_TIME_SECONDS = 2.0
+
+
+class NavBar(Widget):
+  def __init__(self):
+    super().__init__()
+    self.set_rect(rl.Rectangle(0, 0, NAV_BAR_WIDTH, NAV_BAR_HEIGHT))
+    self._alpha = 1.0
+    self._alpha_filter = FirstOrderFilter(1.0, 0.1, 1 / gui_app.target_fps)
+    self._fade_time = 0.0
+
+  def set_alpha(self, alpha: float) -> None:
+    self._alpha = alpha
+    self._fade_time = rl.get_time()
+
+  def show_event(self):
+    super().show_event()
+    self._alpha = 1.0
+    self._alpha_filter.x = 1.0
+    self._fade_time = rl.get_time()
+
+  def _render(self, _):
+    if rl.get_time() - self._fade_time > DISMISS_TIME_SECONDS:
+      self._alpha = 0.0
+    alpha = self._alpha_filter.update(self._alpha)
+
+    # white bar with black border
+    rl.draw_rectangle_rounded(self._rect, 1.0, 6, rl.Color(255, 255, 255, int(255 * 0.9 * alpha)))
+    rl.draw_rectangle_rounded_lines_ex(self._rect, 1.0, 6, 2, rl.Color(0, 0, 0, int(255 * 0.3 * alpha)))
+
+
+class NavWidget(Widget, abc.ABC):
+  """
+  A full screen widget that supports back navigation by swiping down from the top.
+  """
+  BACK_TOUCH_AREA_PERCENTAGE = 0.65
+
+  def __init__(self):
+    super().__init__()
+    self._back_callback: Callable[[], None] | None = None
+    self._back_button_start_pos: MousePos | None = None
+    self._swiping_away = False  # currently swiping away
+    self._can_swipe_away = True  # swipe away is blocked after certain horizontal movement
+
+    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_y_filter = FirstOrderFilter(0.0, 0.1, 1 / gui_app.target_fps)
+
+    self._set_up = False
+
+  @property
+  def back_enabled(self) -> bool:
+    return self._back_enabled() if callable(self._back_enabled) else self._back_enabled
+
+  def set_back_enabled(self, enabled: bool | Callable[[], bool]) -> None:
+    self._back_enabled = enabled
+
+  def set_back_callback(self, callback: Callable[[], None]) -> None:
+    self._back_callback = callback
+
+  def _handle_mouse_event(self, mouse_event: MouseEvent) -> None:
+    # FIXME: disabling this widget on new push_widget still causes this widget to track mouse events without mouse down
+    super()._handle_mouse_event(mouse_event)
+
+    if not self.back_enabled:
+      self._back_button_start_pos = None
+      self._swiping_away = False
+      self._can_swipe_away = True
+      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)
+      in_dismiss_area = mouse_event.pos.y < self._rect.height * self.BACK_TOUCH_AREA_PERCENTAGE
+
+      scroller_at_top = False
+      vertical_scroller = False
+      # TODO: -20? snapping in WiFi dialog can make offset not be positive at the top
+      if hasattr(self, '_scroller'):
+        scroller_at_top = self._scroller.scroll_panel.get_offset() >= -20 and not self._scroller._horizontal
+        vertical_scroller = not self._scroller._horizontal
+      elif hasattr(self, '_scroll_panel'):
+        scroller_at_top = self._scroll_panel.get_offset() >= -20 and not self._scroll_panel._horizontal
+        vertical_scroller = not self._scroll_panel._horizontal
+
+      # 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._can_swipe_away = True
+        self._back_button_start_pos = mouse_event.pos
+
+    elif mouse_event.left_down:
+      if self._back_button_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
+        if not self._swiping_away and (horizontal_movement or upward_movement):
+          self._can_swipe_away = False
+          self._back_button_start_pos = None
+
+        # block horizontal swiping if now swiping away
+        if self._can_swipe_away:
+          if mouse_event.pos.y - self._back_button_start_pos.y > START_DISMISSING_THRESHOLD:
+            self._swiping_away = True
+
+    elif mouse_event.left_released:
+      self._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:
+          self._playing_dismiss_animation = True
+
+      self._back_button_start_pos = None
+      self._swiping_away = False
+
+  def _update_state(self):
+    super()._update_state()
+
+    # Disable self's scroller while swiping away
+    if not self._set_up:
+      self._set_up = True
+      if hasattr(self, '_scroller'):
+        # TODO: use touch_valid
+        original_enabled = self._scroller._enabled
+        self._scroller.set_enabled(lambda: self.enabled and not self._swiping_away and (original_enabled() if callable(original_enabled) else
+                                                                                        original_enabled))
+      elif hasattr(self, '_scroll_panel'):
+        original_enabled = self._scroll_panel.enabled
+        self._scroll_panel.set_enabled(lambda: self.enabled and not self._swiping_away and (original_enabled() if callable(original_enabled) else
+                                                                                            original_enabled))
+
+    if self._trigger_animate_in:
+      self._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
+
+    new_y = 0.0
+
+    if not self.enabled:
+      self._back_button_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:
+      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)
+      if new_y < SWIPE_AWAY_THRESHOLD:
+        new_y /= 2  # resistance until mouse release would dismiss widget
+
+    if self._swiping_away:
+      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
+
+    if new_y > self._rect.height + DISMISS_PUSH_OFFSET - 10:
+      if self._back_callback is not None:
+        self._back_callback()
+
+      self._playing_dismiss_animation = False
+      self._back_button_start_pos = None
+      self._swiping_away = False
+
+    self.set_position(self._rect.x, new_y)
+
+  def _layout(self):
+    # Dim whatever is behind this widget, fading with position (runs after _update_state so position is correct)
+    overlay_alpha = int(200 * max(0.0, min(1.0, 1.0 - self._rect.y / self._rect.height))) if self._rect.height > 0 else 0
+    rl.draw_rectangle(0, 0, int(self._rect.width), int(self._rect.height), rl.Color(0, 0, 0, overlay_alpha))
+
+    bounce_height = 20
+    rl.draw_rectangle(int(self._rect.x), int(self._rect.y), int(self._rect.width), int(self._rect.height + bounce_height), rl.BLACK)
+
+  def render(self, rect: rl.Rectangle | None = None) -> bool | int | None:
+    ret = super().render(rect)
+
+    if self.back_enabled:
+      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
+      # Waiting to show
+      elif nav_bar_delayed:
+        self._nav_bar_y_filter.x = -NAV_BAR_MARGIN - NAV_BAR_HEIGHT
+      # Animate back to top
+      else:
+        self._nav_bar_y_filter.update(NAV_BAR_MARGIN)
+
+      self._nav_bar.set_position(bar_x, round(self._nav_bar_y_filter.x))
+      self._nav_bar.render()
+
+    return ret
+
+  def show_event(self):
+    super().show_event()
+    # FIXME: we don't know the height of the rect at first show_event since it's before the first render :(
+    #  so we need this hacky bool for now
+    self._trigger_animate_in = True
+    self._nav_bar.show_event()