Fix: Go back in gamepad menus

Author: ollm

CHANGELOG.md

@@ -11,7 +11,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### 🐛 Bug Fixes
 
-- Gamepad icons not showing in distribution version
+- Gamepad icons not showing in distribution version [`249640d`](https://github.com/ollm/OpenComic/commit/249640d57f3d5768661b63c0ddf8525a02e44d25)
+- Go back in gamepad menus
 
 ## [v1.0.0-beta.2](https://github.com/ollm/OpenComic/releases/tag/v1.0.0-beta.2) (03-09-2023)
 

README.md

@@ -37,7 +37,8 @@
 * Floating magnifying glass
 * Reading in scroll or slide
 * 🎮 Gamepad navigation
-* [Changelog](https://github.com/ollm/OpenComic/blob/v1.0.0-beta.2/CHANGELOG.md)
+
+You can see the changes between versions in the [Changelog](https://github.com/ollm/OpenComic/blob/master/CHANGELOG.md)
 
 ## Installation and Starting for development
 __Requirements__: Git, Node and NPM

scripts/events.js

@@ -456,6 +456,8 @@ function hideHoverText()
 	}
 }
 
+var fromGamepadMenu = false;
+
 function activeMenu(query, query2 = false, posX = 'left', posY = 'top')
 {
 	let menu = document.querySelector(query);
@@ -510,7 +512,7 @@ function activeMenu(query, query2 = false, posX = 'left', posY = 'top')
 		menuSimple.style.left = '';
 	}
 
-	if(posY == 'top')
+	if(posY == 'top' || posY == 'gamepad')
 	{
 		menuSimple.style.bottom = '';
 		menuSimple.style.top = (top + height + 8)+'px';
@@ -526,6 +528,8 @@ function activeMenu(query, query2 = false, posX = 'left', posY = 'top')
 	else
 		menu.classList.remove('menu-gamepad');
 
+	fromGamepadMenu = (posX == 'gamepad' && posY != 'gamepad') ? true : false;
+
 	shortcuts.pause();
 	gamepad.updateBrowsableItems('menu', true);
 }
@@ -575,6 +579,9 @@ function desactiveMenu(query, query2 = false)
 		gamepad.cleanBrowsableItems();
 
 	shortcuts.play();
+
+	if(fromGamepadMenu)
+		gamepad.showMenu();
 }
 
 // Dialogs

scripts/gamepad.js

@@ -591,16 +591,16 @@ function highlightItemContextMenu()
 		new Function(current.element.getAttribute('oncontextmenu')).call(current.element);
 }
 
-function showMenu(index = false)
+function showMenu()
 {
-	let query = index ? '#index-menu-gamepad' : '#reading-menu-gamepad';
+	let query = !onReading ? '#index-menu-gamepad' : '#reading-menu-gamepad';
 
 	if(document.querySelector(query+' .menu-simple.a'))
 		events.desactiveMenu(query);
 	else
-		events.activeMenu(query, false, 'gamepad');
+		events.activeMenu(query, false, 'gamepad', 'gamepad');
 
-	if(index)
+	if(!onReading)
 	{
 		let viewIcon = document.querySelector('.menu-gamepad-view-icon');
 		if(!viewIcon) return;
@@ -709,7 +709,7 @@ setButtonEvent('browsableItems', [0, 2, 3, 9, 12, 13, 14, 15, 16], function(key)
 	else if(key == 15)
 		highlightClosestItem(1);
 	else if(!onReading && (key == 9 || key == 16))
-		showMenu(true);
+		showMenu();
 
 });