Menu focus fixes

libretro · Aug 23, 2021 · 189c56d · 189c56d
1 parent fc33258
commit 189c56d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/menu/menu.go b/menu/menu.go
@@ -92,7 +92,9 @@ func (m *Menu) Render(dt float32) {
 
 		m.stack[i].render()
 	}
-	m.stack[m.focus-1].drawHintBar()
+	if m.focus-1 < len(m.stack) {
+		m.stack[m.focus-1].drawHintBar()
+	}
 }
 
 // ContextReset uploads the UI images to the GPU.

diff --git a/menu/scene_history.go b/menu/scene_history.go
@@ -39,12 +39,11 @@ func loadHistoryEntry(list Scene, game history.Game) {
 			System:   game.System,
 			CorePath: corePath,
 		})
-		list.segueNext()
-		menu.Push(buildQuickMenu())
-		menu.tweens.FastForward() // position the elements without animating
+		history.Load()
+		menu.WarpToQuickMenu()
 		state.MenuActive = false
 	} else {
-		list.segueNext()
-		menu.Push(buildQuickMenu())
+		menu.WarpToQuickMenu()
+		state.MenuActive = false
 	}
 }
diff --git a/menu/scene_playlist.go b/menu/scene_playlist.go
@@ -78,12 +78,12 @@ func loadPlaylistEntry(list Scene, playlist string, game playlists.Game) {
 			System:   playlist,
 			CorePath: corePath,
 		})
-		list.segueNext()
-		menu.Push(buildQuickMenu())
-		menu.tweens.FastForward() // position the elements without animating
+		history.Load()
+		menu.WarpToQuickMenu()
 		state.MenuActive = false
 	} else {
 		list.segueNext()
-		menu.Push(buildQuickMenu())
+		menu.WarpToQuickMenu()
+		state.MenuActive = false
 	}
 }