Validation fun

grorp · Feb 16, 2025 · d9375bb · d9375bb
1 parent b49f70e
commit d9375bb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/gui/touchcontrols.cpp b/src/gui/touchcontrols.cpp
@@ -369,11 +369,10 @@ TouchControls::~TouchControls()
 
 bool TouchControls::mayAddButton(touch_gui_button_id id)
 {
-	if (!ButtonLayout::isButtonAllowed(id))
-		return false;
-	if (id != overflow_id && id_to_keycode(id) == KEY_UNKNOWN)
-		return false;
-	return true;
+	assert(ButtonLayout::isButtonValid(id));
+	assert(ButtonLayout::isButtonAllowed(id));
+	// The overflow button doesn't need a keycode to be valid.
+	return id == overflow_id || id_to_keycode(id) != KEY_UNKNOWN;
 }
 
 void TouchControls::addButton(std::vector<button_info> &buttons, touch_gui_button_id id,

diff --git a/src/gui/touchscreenlayout.cpp b/src/gui/touchscreenlayout.cpp
@@ -152,7 +152,7 @@ bool ButtonLayout::isButtonAllowed(touch_gui_button_id id)
 	if (id == dig_id || id == place_id)
 		return g_settings->get("touch_interaction_style") == buttons_crosshair;
 	if (id == aux1_id)
-		return g_settings->getBool("virtual_joystick_triggers_aux1");
+		return !g_settings->getBool("virtual_joystick_triggers_aux1");
 	return true;
 }
 
@@ -293,7 +293,7 @@ std::vector<touch_gui_button_id> ButtonLayout::getMissingButtons()
 	std::vector<touch_gui_button_id> missing_buttons;
 	for (u8 i = 0; i < touch_gui_button_id_END; i++) {
 		touch_gui_button_id btn = (touch_gui_button_id)i;
-		if (isButtonAllowed(btn) && layout.count(btn) == 0)
+		if (isButtonValid(btn) && isButtonAllowed(btn) && layout.count(btn) == 0)
 			missing_buttons.push_back(btn);
 	}
 	return missing_buttons;