diff nuklear_ui/blastem_nuklear.c @ 2306:62f316b76e9a

Migrate ui.exit to ui.menu and create a new ui.exit for quitting
author Michael Pavone <pavone@retrodev.com>
date Thu, 23 Mar 2023 22:37:08 -0700
parents a1c9edf44c7e
children a8080240cb92
line wrap: on
line diff
--- a/nuklear_ui/blastem_nuklear.c	Wed Mar 15 19:28:11 2023 -0700
+++ b/nuklear_ui/blastem_nuklear.c	Thu Mar 23 22:37:08 2023 -0700
@@ -478,12 +478,12 @@
 		"gamepads.2.start", "gamepads.2.mode"
 	};
 	static const char *general_binds[] = {
-		"ui.exit", "ui.save_state", "ui.load_state", "ui.toggle_fullscreen", "ui.soft_reset", "ui.reload",
-		"ui.screenshot", "ui.vgm_log", "ui.sms_pause", "ui.toggle_keyboard_captured", "ui.release_mouse"
+		"ui.menu", "ui.save_state", "ui.load_state", "ui.toggle_fullscreen", "ui.soft_reset", "ui.reload",
+		"ui.screenshot", "ui.vgm_log", "ui.sms_pause", "ui.toggle_keyboard_captured", "ui.release_mouse", "ui.exit"
 	};
 	static const char *general_names[] = {
 		"Show Menu", "Quick Save", "Quick Load", "Toggle Fullscreen", "Soft Reset", "Reload Media",
-		"Internal Screenshot", "Toggle VGM Log", "SMS Pause", "Capture Keyboard", "Release Mouse"
+		"Internal Screenshot", "Toggle VGM Log", "SMS Pause", "Capture Keyboard", "Release Mouse", "Exit"
 	};
 	static const char *speed_binds[] = {
 		"ui.next_speed", "ui.prev_speed",
@@ -631,7 +631,8 @@
 		conf_names = tern_insert_ptr(conf_names, "ui.enter_debugger", "Enter CPU Debugger");
 		conf_names = tern_insert_ptr(conf_names, "ui.screenshot", "Take Screenshot");
 		conf_names = tern_insert_ptr(conf_names, "ui.vgm_log", "Toggle VGM Log");
-		conf_names = tern_insert_ptr(conf_names, "ui.exit", "Show Menu");
+		conf_names = tern_insert_ptr(conf_names, "ui.menu", "Show Menu");
+		conf_names = tern_insert_ptr(conf_names, "ui.exit", "Exit");
 		conf_names = tern_insert_ptr(conf_names, "ui.save_state", "Quick Save");
 		conf_names = tern_insert_ptr(conf_names, "ui.load_state", "Quick Load");
 		conf_names = tern_insert_ptr(conf_names, "ui.set_speed.0", "Set Speed 0");
@@ -698,9 +699,10 @@
 	static const char *emu_control[] = {
 		"ui.save_state",
 		"ui.load_state",
-		"ui.exit",
+		"ui.menu",
 		"ui.toggle_fullscreen",
 		"ui.screenshot",
+		"ui.exit",
 		"ui.release_mouse",
 		"ui.toggle_keyboard_captured"
 	};