Mercurial > repos > blastem

changeset 2379:9e6cb50d0639

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix accidental search and replace in UI code
author Michael Pavone <pavone@retrodev.com>
date Sat, 18 Nov 2023 22:00:45 -0800
parents af3075c1e421
children 1b21290358a8
files nuklear_ui/blastem_nuklear.c
diffstat 1 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/nuklear_ui/blastem_nuklear.c	Sat Nov 18 11:34:33 2023 -0800
+++ b/nuklear_ui/blastem_nuklear.c	Sat Nov 18 22:00:45 2023 -0800
@@ -1061,7 +1061,7 @@
 	options[BY_INDEX].title = by_index_names[selected_controller];
 	options[SIMILAR_CONTROLLERS].title = make_human_readable_type_name(&selected_controller_info);
 
-	if ((context, "Select Binding Dest", nk_rect(0, 0, render_width(), render_height()), NK_WINDOW_NO_SCROLLBAR)) {
+	if (nk_begin(context, "Select Binding Dest", nk_rect(0, 0, render_width(), render_height()), NK_WINDOW_NO_SCROLLBAR)) {
 		menu(context, NUM_DEST_TYPES, options, handle_dest_clicked);
 		nk_end(context);
 	}
@@ -1087,7 +1087,7 @@
 
 void view_controller_bindings(struct nk_context *context)
 {
-	if ((context, "Controller Bindings", nk_rect(0, 0, render_width(), render_height()), NK_WINDOW_NO_SCROLLBAR)) {
+	if (nk_begin(context, "Controller Bindings", nk_rect(0, 0, render_width(), render_height()), NK_WINDOW_NO_SCROLLBAR)) {
 		if (!bindings) {
 			bindings = calloc(1, sizeof(*bindings));
 			tern_node *pad = get_binding_node_for_pad(selected_controller, &selected_controller_info);
@@ -1282,7 +1282,7 @@
 	char buffer[512];
 	static int quiet, button_a = -1, button_a_axis = -1;
 	uint8_t added_mapping = 0;
-	if ((context, "Controllers", nk_rect(0, 0, render_width(), render_height()), NK_WINDOW_NO_SCROLLBAR)) {
+	if (nk_begin(context, "Controllers", nk_rect(0, 0, render_width(), render_height()), NK_WINDOW_NO_SCROLLBAR)) {
 
 		nk_layout_space_begin(context, NK_STATIC, render_height() - context->style.font->height, 3);
 
@@ -1423,7 +1423,7 @@
 static void view_controller_variant(struct nk_context *context)
 {
 	uint8_t selected = 0;
-	if ((context, "Controller Type", nk_rect(0, 0, render_width(), render_height()), 0)) {
+	if (nk_begin(context, "Controller Type", nk_rect(0, 0, render_width(), render_height()), 0)) {
 		nk_layout_row_static(context, context->style.font->height*1.25, render_width() - context->style.font->height * 2, 1);
 		nk_label(context, "", NK_TEXT_CENTERED);
 		nk_label(context, "Select the layout that", NK_TEXT_CENTERED);
@@ -1518,7 +1518,7 @@
 
 void view_controller_type(struct nk_context *context)
 {
-	if ((context, "Controller Type", nk_rect(0, 0, render_width(), render_height()), 0)) {
+	if (nk_begin(context, "Controller Type", nk_rect(0, 0, render_width(), render_height()), 0)) {
 		controller_type_group(context, "Xbox", TYPE_XBOX, SUBTYPE_XBOX, (const char *[]){
 			"Original", "Xbox 360", "Xbox One/Series", "Xbox Elite"
 		}, 4);
@@ -1604,7 +1604,7 @@
 
 void view_deadzones(struct nk_context *context)
 {
-	if ((context, "Deadzones", nk_rect(0, 0, render_width(), render_height()), NK_WINDOW_NO_SCROLLBAR)) {
+	if (nk_begin(context, "Deadzones", nk_rect(0, 0, render_width(), render_height()), NK_WINDOW_NO_SCROLLBAR)) {
 		nk_layout_space_begin(context, NK_STATIC, render_height() - 3 * context->style.font->height, 4);
 
 		float left = render_width() / 8.0f, top = render_height() / 8.0f;
@@ -1654,7 +1654,7 @@
 
 void view_controllers(struct nk_context *context)
 {
-	if ((context, "Controllers", nk_rect(0, 0, render_width(), render_height()), NK_WINDOW_NO_SCROLLBAR)) {
+	if (nk_begin(context, "Controllers", nk_rect(0, 0, render_width(), render_height()), NK_WINDOW_NO_SCROLLBAR)) {
 		int height = (render_height() - 2*context->style.font->height) / 5;
 		int inner_height = height - context->style.window.spacing.y;
 		const struct nk_user_font *font = context->style.font;
@@ -2034,7 +2034,7 @@
 	if (desired_width > width) {
 		desired_width = width;
 	}
-	if ((context, "Video Settings", nk_rect(0, 0, width, height), 0)) {
+	if (nk_begin(context, "Video Settings", nk_rect(0, 0, width, height), 0)) {
 		nk_layout_row_static(context, context->style.font->height, desired_width, 2);
 		settings_toggle(context, "Fullscreen", "video\0fullscreen\0", 0);
 		settings_toggle(context, "Open GL", "video\0gl\0", 1);