improve menu system

Author: mstop4

current-scripts/Demos/useful-scripts/objects/obj_grid_menu_demo/Create_0.gml

@@ -44,7 +44,7 @@ menu.grid_menu_add_selectable(1, 0, {
 menu.grid_menu_add_key_config(1, 1, { 
 	label: "Qux",
 	inital_keycode: vk_space,
-	on_change_func: -1,
+	on_change_func: ",
 	on_change_args: -1,
 	on_confirm_func: -1,
 	on_confirm_args: [-1],

current-scripts/Demos/useful-scripts/scripts/column_menu_functions/column_menu_functions.gml

@@ -6,7 +6,7 @@
 //         - {sound}  cursor_change_sfx
 //         - {sound}  cursor_confirm_sfx
 function column_menu_init(_config) {
-	self.menu_base_init(_config.font, _config.cursor_spr);	
+	self.menu_base_init(_config.font, _config.cursor_spr);
 
 	menu_font = _config.font;
 	cursor_spr = _config.cursor_spr;
@@ -16,6 +16,22 @@ function column_menu_init(_config) {
 	cursor_confirm_sfx = _config.cursor_confirm_sfx;
 }
 
+/// @func column_menu_get_item_by_index(index)
+/// @param {number} index
+function column_menu_get_item_by_index(_index) {
+	return self.items[| _index];
+}
+
+/// @func column_menu_get_item_by_label(label)
+/// @param {string} label
+function column_menu_get_item_by_label(_label) {
+	for (var i=0; i<num_items; i++) {
+		if (self.items[| i].label == _label) return self.items[| i];
+	}
+	
+	return noone;
+}
+
 /// @func  column_menu_add_selectable(config)
 /// @param config 
 //         - {string}   label
@@ -26,6 +42,8 @@ function column_menu_add_selectable(_config) {
 	var _new = new MenuSelectable(_config);
 	ds_list_add(items, _new);
 	num_items++;
+	_new.parent_menu = self;
+		return _new;
 }
 
 /// @func  column_menu_add_spinner(config)
@@ -43,6 +61,8 @@ function column_menu_add_spinner(_config) {
 	var _new = new MenuSpinner(_config);
 	ds_list_add(items, _new);
 	num_items++;
+	_new.parent_menu = self;
+	return _new;
 }
 
 /// @param column_menu_add_key_config(config)
@@ -56,4 +76,6 @@ function column_menu_add_key_config(_config) {
 	var _new = new MenuKeyConfig(_config);
 	ds_list_add(items, _new);
 	num_items++;
+	_new.parent_menu = self;
+	return _new;
 }

current-scripts/Demos/useful-scripts/scripts/grid_menu_functions/grid_menu_functions.gml

@@ -9,8 +9,8 @@
 //         - {sound}  cursor_change_sfx
 //         - {sound}  cursor_confirm_sfx
 function grid_menu_init(_config) {
-	self.menu_base_init(_config.font, _config.cursor_spr);	
-
+	self.menu_base_init(_config.font, _config.cursor_spr);
+	
 	column_width = _config.column_width;
 	menu_font = _config.font;
 	cursor_spr = _config.cursor_spr;
@@ -22,6 +22,28 @@ function grid_menu_init(_config) {
 	ds_grid_resize(items, _config.width, _config.height);
 }
 
+/// @func grid_menu_get_item_by_index(x, y)
+/// @param {number} x
+/// @param {number} y
+function grid_menu_get_item_by_index(_x, _y) {
+	return self.items[# _x, _y];
+}
+
+/// @func grid_menu_get_item_by_label(label)
+/// @param {string} label
+function grid_menu_get_item_by_label(_label) {
+	var _width = ds_grid_width(items);
+	var _height = ds_grid_height(items);
+	
+	for (var i=0; i<_width; i++) {
+		for (var j=0; j<_height; j++) {		
+			if (self.items[# i, j].label == _label) return self.items[# i, j];
+		}
+	}
+	
+	return noone;
+}
+
 /// @func  grid_menu_add_selectable(x, y, config)
 /// @param x
 /// @param y
@@ -36,7 +58,9 @@ function grid_menu_add_selectable(_x, _y, _config) {
 			return;
 
 	var _new = new MenuSelectable(_config);
+	_new.parent_menu = self;
 	items[# _x, _y] = _new;
+	return _new;
 }
 
 /// @func  grid_menu_add_spinner(x, y, config)
@@ -58,7 +82,9 @@ function grid_menu_add_spinner(_x, _y, _config) {
 			return;
 
 	var _new = new MenuSpinner(_config);
+	_new.parent_menu = self;
 	items[# _x, _y] = _new;
+	return _new;
 }
 
 /// @param grid_menu_add_key_config(x, y, config)
@@ -76,5 +102,7 @@ function grid_menu_add_key_config(_x, _y, _config) {
 			return;
 
 	var _new = new MenuKeyConfig(_config);
+	_new.parent_menu = self;
 	items[# _x, _y] = _new;
+	return _new;
 }

current-scripts/Demos/useful-scripts/scripts/menu_base_functions/menu_base_functions.gml

@@ -39,7 +39,13 @@ function handle_spinner_change(_item, _direction) {
 	_item.cur_index = wrap(_item.cur_index+_direction, 0, _num_values-1);
 
 	if (script_exists(_item.on_change_func)) {
-		script_execute(_item.on_change_func, _item.cur_index, _item.values[_item.cur_index], _item.on_change_args);
+		script_execute(
+			_item.on_change_func,
+			_item.cur_index,
+			_item.values[_item.cur_index],
+			_direction,
+			_item.on_change_args
+		);
 	}
 
 	if (!_item.silent_on_change && audio_exists(cursor_change_sfx)) {

current-scripts/Demos/useful-scripts/scripts/menu_base_structs/menu_base_structs.gml

@@ -41,6 +41,7 @@ function MenuItem(_config) constructor {
 	types = ds_list_create();
 	ds_list_add(types, "item");
 	label = _config.label;
+	parent_menu = noone;
 
 	function destroy() {
 		ds_list_destroy(types);
@@ -61,28 +62,39 @@ function MenuSelectable(_config) : MenuItem(_config) constructor {
 	silent_on_confirm = _config.silent_on_confirm;
 }
 
-
-/// @func  MenuSpinner(config)
+/// @func  MenuSpinnerBase(config)
 /// @param config 
 //         - {string}   label
-//         - {array}    values
-//         - {integer}  init_index
 //         - {function} on_confirm_func
 //         - {array}    on_confirm_args
 //         - {function} on_change_func
 //         - {array}    on_change_args
 //         - {boolean}  silent_on_confirm
 //         - {boolean}  silent_on_change
-function MenuSpinner(_config) : MenuItem(_config) constructor {
+function MenuSpinnerBase(_config) : MenuItem(_config) constructor {
 	ds_list_add(types, "spinner");
 	on_confirm_func = asset_get_index(_config.on_confirm_func);
 	on_confirm_args = _config.on_confirm_args;
 	silent_on_confirm = _config.silent_on_confirm;
-	values = _config.values;
-	cur_index = clamp(_config.init_index, 0, array_length(values));
 	on_change_func = asset_get_index(_config.on_change_func);
 	on_change_args = _config.on_change_args;
 	silent_on_change = _config.silent_on_change;
+}
+
+/// @func  MenuSpinner(config)
+/// @param config 
+//         - {string}   label
+//         - {array}    values
+//         - {integer}  init_index
+//         - {function} on_confirm_func
+//         - {array}    on_confirm_args
+//         - {function} on_change_func
+//         - {array}    on_change_args
+//         - {boolean}  silent_on_confirm
+//         - {boolean}  silent_on_change
+function MenuSpinner(_config) : MenuSpinnerBase(_config) constructor {
+	values = _config.values;
+	cur_index = clamp(_config.init_index, 0, array_length(values));
 
 	function get_full_label() {
 		return concat(label, ": ", values[cur_index]);