Cleanup back callback logic

Author: krypciak

src/gui/gui.ts

@@ -2,15 +2,6 @@ import { Lang } from '../lang-manager.js'
 import { registerDynamicIcons, registerModManagerIcons } from './icons.js'
 import './menu.js'
 
-function enterModsMenu(direct: boolean) {
-    if (direct) {
-        sc.menu.setDirectMode(true, sc.MENU_SUBMENU.MODS)
-        sc.model.enterMenu(true)
-    } else {
-        sc.menu.pushMenu(sc.MENU_SUBMENU.MODS)
-    }
-}
-
 declare global {
     namespace sc {
         interface OptionsMenu {
@@ -33,13 +24,14 @@ sc.OptionsMenu.inject({
             HIDDEN: { state: { offsetY: -this.modsButton.hook.size.y }, time: 0.2, timeFunction: KEY_SPLINES.LINEAR },
         }
         this.modsButton.onButtonPress = () => {
-            enterModsMenu(false)
+            sc.menu.pushMenu(sc.MENU_SUBMENU.MODS)
         }
     },
     showMenu() {
         this.parent()
         if (sc.menu.backCallbackStack.length >= 2) {
-            sc.menu.popBackCallback()
+            /* the options menu doesnt expect to get shown again,
+             * so it always adds a pop callback, and it needs to be removed */
             sc.menu.popBackCallback()
         }
     },

src/gui/menu.ts

@@ -62,7 +62,6 @@ declare global {
             setBlackBarVisibility(this: this, visible: boolean): void
             setAllVisibility(this: this, visible: boolean): void
             updateInstallButtonText(this: this): void
-            onBackButtonPress(this: this): void
             setTabEvent(this: this): void
             showModInstallDialog(this: this): void
             getCurrentlyFocusedModEntry(this: this): modmanager.gui.ListEntry | undefined
@@ -458,10 +457,9 @@ modmanager.gui.Menu = sc.ListInfoMenu.extend({
         if (main?.info) main.info.doStateTransition(state)
         if (main?.topBar) main.topBar.doStateTransition(state)
     },
-    showMenu() {
-        this.parent()
-        sc.menu.pushBackCallback(() => this.onBackButtonPress())
-        sc.menu.moveLeaSprite(0, 0, sc.MENU_LEA_STATE.HIDDEN)
+    showMenu(previousMenu, prevSubmenu) {
+        this.parent(previousMenu, prevSubmenu)
+        if (prevSubmenu != sc.MENU_SUBMENU.OPTIONS) sc.menu.popBackCallback()
 
         this.setAllVisibility(true)
         this.setBlackBarVisibility(false)
@@ -490,8 +488,6 @@ modmanager.gui.Menu = sc.ListInfoMenu.extend({
     },
     hideMenu() {
         this.parent()
-        sc.menu.moveLeaSprite(0, 0, sc.MENU_LEA_STATE.LARGE)
-        this.exitMenu()
         this.setAllVisibility(false)
         this.setBlackBarVisibility(true)
 
@@ -517,11 +513,6 @@ modmanager.gui.Menu = sc.ListInfoMenu.extend({
                 }
             })
         }
-
-    },
-    onBackButtonPress() {
-        sc.menu.popBackCallback()
-        sc.menu.popMenu()
     },
     createHelpGui() {
         if (!this.helpGui) {

src/gui/options/mod-options-menu.ts

@@ -38,7 +38,6 @@ declare global {
     }
 }
 
-let menuPurgeTimeoutId: NodeJS.Timeout
 modmanager.gui.OptionsMenu = sc.BaseMenu.extend({
     init() {
         this.parent()
@@ -114,11 +113,14 @@ modmanager.gui.OptionsMenu = sc.BaseMenu.extend({
         this.listBox.removeObservers()
     },
     showMenu(previousMenu, prevSubmenu) {
-        clearTimeout(menuPurgeTimeoutId)
         this.parent(previousMenu, prevSubmenu)
 
         this.addObservers()
 
+        sc.menu.pushBackCallback(() => {
+            sc.menu.popBackCallback()
+            sc.menu.popMenu()
+        })
         sc.menu.moveLeaSprite(0, 0, sc.MENU_LEA_STATE.HIDDEN)
 
         sc.menu.buttonInteract.addGlobalButton(this.hotkeyHelp, () => sc.control.menuHotkeyHelp())
@@ -131,20 +133,12 @@ modmanager.gui.OptionsMenu = sc.BaseMenu.extend({
 
         this.removeObservers()
         sc.menu.moveLeaSprite(0, 0, sc.MENU_LEA_STATE.LARGE)
+        this.exitMenu()
 
         sc.menu.buttonInteract.removeGlobalButton(this.hotkeyHelp)
         sc.menu.buttonInteract.removeGlobalButton(this.hotkeyDefault)
 
-        sc.menu.popBackCallback()
-
         this.listBox.hideMenu()
-
-        /* purging the menu immediately would disable the smooth fade out transition */
-        menuPurgeTimeoutId = setTimeout(() => {
-            const mainMenu = sc.menu.guiReference
-            mainMenu.removeChildGui(this)
-            delete mainMenu.submenus[modOptionsMenuId]
-        }, 1000)
     },
     commitHotKeysToTopBar(longTransition) {
         if (this.getHelpMenuLangData()) sc.menu.addHotkey(() => this.hotkeyHelp)