From 71f35b61c389066a4421e2c61840aa6f49e15484 Mon Sep 17 00:00:00 2001 From: BeezBumba Date: Thu, 3 Sep 2026 16:32:12 -0500 Subject: [PATCH] fix button labels in BPM --- .../BigPicture/overlay_big_picture_game_details.cpp | 4 ++-- .../BigPicture/overlay_big_picture_game_grid.cpp | 4 ++-- .../HomeMenu/overlay_home_menu_message_box.cpp | 13 ++----------- rpcs3/Emu/RSX/Overlays/overlay_controls.cpp | 11 +++++++++++ rpcs3/Emu/RSX/Overlays/overlay_controls.h | 4 ++++ rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp | 13 ++----------- rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp | 12 ++---------- rpcs3/Emu/RSX/Overlays/overlay_osk.cpp | 9 +-------- 8 files changed, 26 insertions(+), 44 deletions(-) diff --git a/rpcs3/Emu/RSX/Overlays/BigPicture/overlay_big_picture_game_details.cpp b/rpcs3/Emu/RSX/Overlays/BigPicture/overlay_big_picture_game_details.cpp index a50077f27354..c9daceba5b07 100644 --- a/rpcs3/Emu/RSX/Overlays/BigPicture/overlay_big_picture_game_details.cpp +++ b/rpcs3/Emu/RSX/Overlays/BigPicture/overlay_big_picture_game_details.cpp @@ -33,12 +33,12 @@ namespace rsx m_info_text.set_wrap_text(true); m_info_text.set_size(width - 80, 200); - m_start_btn.set_image_resource(resource_config::standard_image_resource::cross); + m_start_btn.set_image_resource(resource_config::confirm_button_resource()); m_start_btn.set_text(localized_string_id::BIG_PICTURE_GAME_DETAILS_START); m_start_btn.set_font("Arial", 16); m_start_btn.set_pos(x + 40, y + height - 80); - m_back_hint.set_image_resource(resource_config::standard_image_resource::circle); + m_back_hint.set_image_resource(resource_config::cancel_button_resource()); m_back_hint.set_text(localized_string_id::BIG_PICTURE_HINT_BACK); m_back_hint.set_font("Arial", 16); m_back_hint.set_pos(x + 40 + 120 + 20, y + height - 80); diff --git a/rpcs3/Emu/RSX/Overlays/BigPicture/overlay_big_picture_game_grid.cpp b/rpcs3/Emu/RSX/Overlays/BigPicture/overlay_big_picture_game_grid.cpp index e49127252721..371ac56c66ae 100644 --- a/rpcs3/Emu/RSX/Overlays/BigPicture/overlay_big_picture_game_grid.cpp +++ b/rpcs3/Emu/RSX/Overlays/BigPicture/overlay_big_picture_game_grid.cpp @@ -65,12 +65,12 @@ namespace rsx m_highlight->back_color = color4f(0.f, 0.f, 0.f, 0.f); m_highlight->pulse_effect_enabled = true; - m_back_hint.set_image_resource(resource_config::standard_image_resource::circle); + m_back_hint.set_image_resource(resource_config::cancel_button_resource()); m_back_hint.set_text(localized_string_id::BIG_PICTURE_HINT_BACK); m_back_hint.set_font("Arial", 16); m_back_hint.set_pos(x + width - 2 * (30 + 120), y + height + 20); - m_select_hint.set_image_resource(resource_config::standard_image_resource::cross); + m_select_hint.set_image_resource(resource_config::confirm_button_resource()); m_select_hint.set_text(localized_string_id::BIG_PICTURE_HINT_SELECT); m_select_hint.set_font("Arial", 16); m_select_hint.set_pos(x + width - (30 + 120), y + height + 20); diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.cpp index f906283987d9..8a01a294e017 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.cpp +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "overlay_home_menu_message_box.h" -#include "Emu/system_config.h" namespace rsx { @@ -20,16 +19,8 @@ namespace rsx m_label.set_font("Arial", 16); m_label.back_color.a = 0.0f; - if (g_cfg.sys.enter_button_assignment == enter_button_assign::circle) - { - m_accept_btn.set_image_resource(resource_config::standard_image_resource::circle); - m_cancel_btn.set_image_resource(resource_config::standard_image_resource::cross); - } - else - { - m_accept_btn.set_image_resource(resource_config::standard_image_resource::cross); - m_cancel_btn.set_image_resource(resource_config::standard_image_resource::circle); - } + m_accept_btn.set_image_resource(resource_config::confirm_button_resource()); + m_cancel_btn.set_image_resource(resource_config::cancel_button_resource()); m_accept_btn.set_pos(x + 30, y + height + 20); m_cancel_btn.set_pos(x + 180, y + height + 20); diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp b/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp index 3280c253ef9a..84d52dd394db 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp @@ -7,6 +7,7 @@ #include "Utilities/File.h" #include "Emu/Cell/timers.hpp" #include "Loader/ISO.h" +#include "Emu/system_config.h" #include @@ -259,6 +260,16 @@ namespace rsx return info; } + resource_config::standard_image_resource resource_config::confirm_button_resource() + { + return g_cfg.sys.enter_button_assignment == enter_button_assign::circle ? circle : cross; + } + + resource_config::standard_image_resource resource_config::cancel_button_resource() + { + return g_cfg.sys.enter_button_assignment == enter_button_assign::circle ? cross : circle; + } + void resource_config::load_files() { const std::array texture_resource_files diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.h b/rpcs3/Emu/RSX/Overlays/overlay_controls.h index 1afa0ff3b9c9..efd850c61cff 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_controls.h +++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.h @@ -101,6 +101,10 @@ namespace rsx void free_resources(); static std::unique_ptr load_icon(std::string_view relative_path); + + // Cross/Circle icon for confirm/cancel prompts, swapped when "Enter button assignment" is Circle. + static standard_image_resource confirm_button_resource(); + static standard_image_resource cancel_button_resource(); }; struct compiled_resource diff --git a/rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp b/rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp index 943da6271bca..174276dfddfe 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" #include "overlay_list_view.hpp" -#include "Emu/system_config.h" namespace rsx { @@ -31,16 +30,8 @@ namespace rsx m_accept_btn->set_size(120, 30); m_cancel_btn->set_size(120, 30); - if (g_cfg.sys.enter_button_assignment == enter_button_assign::circle) - { - m_accept_btn->set_image_resource(resource_config::standard_image_resource::circle); - m_cancel_btn->set_image_resource(resource_config::standard_image_resource::cross); - } - else - { - m_accept_btn->set_image_resource(resource_config::standard_image_resource::cross); - m_cancel_btn->set_image_resource(resource_config::standard_image_resource::circle); - } + m_accept_btn->set_image_resource(resource_config::confirm_button_resource()); + m_cancel_btn->set_image_resource(resource_config::cancel_button_resource()); m_scroll_indicator->set_pos(width - 7, 0); m_accept_btn->set_pos(30, height + 20); diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp index 7e5bea2fd9af..7d1b29eea413 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp @@ -47,16 +47,8 @@ namespace rsx btn_cancel.set_pos(685, 420); btn_cancel.set_font("Arial", 16); - if (g_cfg.sys.enter_button_assignment == enter_button_assign::circle) - { - btn_ok.set_image_resource(resource_config::standard_image_resource::circle); - btn_cancel.set_image_resource(resource_config::standard_image_resource::cross); - } - else - { - btn_ok.set_image_resource(resource_config::standard_image_resource::cross); - btn_cancel.set_image_resource(resource_config::standard_image_resource::circle); - } + btn_ok.set_image_resource(resource_config::confirm_button_resource()); + btn_cancel.set_image_resource(resource_config::cancel_button_resource()); fade_animation.duration_sec = 0.15f; diff --git a/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp b/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp index fce759f18fa5..c603fc1cd630 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp @@ -517,14 +517,7 @@ namespace rsx m_btn_space.set_image_resource(resource_config::standard_image_resource::triangle); m_btn_delete.set_image_resource(resource_config::standard_image_resource::square); - if (g_cfg.sys.enter_button_assignment == enter_button_assign::circle) - { - m_btn_cancel.set_image_resource(resource_config::standard_image_resource::cross); - } - else - { - m_btn_cancel.set_image_resource(resource_config::standard_image_resource::circle); - } + m_btn_cancel.set_image_resource(resource_config::cancel_button_resource()); m_update = true; set_visible(continuous_mode != CELL_OSKDIALOG_CONTINUOUS_MODE_HIDE);