cursor fix pt2

Author: sshane

selfdrive/ui/mici/layouts/main.py

@@ -77,38 +77,50 @@ def _render(self, _):
     # Render
     self._scroller.render(self._rect)
 
-    # If not in background stack
-    if self.enabled:
-      self._handle_transitions()
+    self._handle_transitions()
 
   def _handle_transitions(self):
+    # Don't pop if onboarding
+    if gui_app.get_active_widget() == self._onboarding_window:
+      return
+
     if ui_state.started != self._prev_onroad:
       self._prev_onroad = ui_state.started
 
+      # onroad: after delay, pop nav stack and scroll to onroad
+      # offroad: immediately scroll to home, but don't pop nav stack (can stay in settings)
       if ui_state.started:
         self._onroad_time_delay = rl.get_time()
       else:
         self._scroll_to(self._home_layout)
 
-    # delay so we show home for a bit after starting
     if self._onroad_time_delay is not None and rl.get_time() - self._onroad_time_delay >= ONROAD_DELAY:
+      gui_app.pop_widgets_to(self)
       self._scroll_to(self._onroad_layout)
       self._onroad_time_delay = None
 
+    # when car leaves standstill, pop nav stack and scroll to onroad
     CS = ui_state.sm["carState"]
     if not CS.standstill and self._prev_standstill:
+      gui_app.pop_widgets_to(self)
       self._scroll_to(self._onroad_layout)
     self._prev_standstill = CS.standstill
 
   def _on_interactive_timeout(self):
-    """Called on screen interactive timeout — scroll to default view, but don't disrupt onboarding or settings."""
     print(f'_on_interactive_timeout, {ui_state.started=}')
-    if not self._onboarding_window.completed or gui_app.get_active_widget() != self:
+
+    # Don't pop if onboarding
+    print('get active', gui_app.get_active_widget(), self._onboarding_window.completed)
+    if gui_app.get_active_widget() == self._onboarding_window:
       return
 
-    if ui_state.started and not ui_state.sm["carState"].standstill:
-      self._scroll_to(self._onroad_layout)
-    elif not ui_state.started:
+    if ui_state.started:
+      # Don't pop if at standstill
+      if not ui_state.sm["carState"].standstill:
+        gui_app.pop_widgets_to(self)
+        self._scroll_to(self._onroad_layout)
+    else:
+      gui_app.pop_widgets_to(self)
       self._scroll_to(self._home_layout)
 
   def _on_bookmark_clicked(self):