fix last selected elem after screen change

Open-Hexagon · Aug 20, 2023 · 9b27603 · 9b27603
1 parent 3c680ae
commit 9b27603
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/ui/keyboard_navigation.lua b/ui/keyboard_navigation.lua
@@ -2,11 +2,6 @@ local keyboard_navigation = {}
 local current_screen
 local selected_element
 
-function keyboard_navigation.set_screen(screen)
-    current_screen = screen
-    selected_element = nil
-end
-
 function keyboard_navigation.get_screen()
     return current_screen
 end
@@ -32,6 +27,17 @@ local function get_first_element(element)
     end
 end
 
+function keyboard_navigation.set_screen(screen)
+    if current_screen then
+        current_screen.last_selected_element = selected_element
+    end
+    current_screen = screen
+    keyboard_navigation.select_element()
+    if current_screen.last_selected_element then
+        keyboard_navigation.select_element(current_screen.last_selected_element)
+    end
+end
+
 local function scroll_into_view(element)
     if element.parent then
         scroll_into_view(element.parent)