Skip to content

fix button labels in BPM #19401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BeezBumba wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −44
Open

fix button labels in BPM #19401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions rpcs3/Emu/RSX/Overlays/BigPicture/overlay_big_picture_game_details.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions rpcs3/Emu/RSX/Overlays/BigPicture/overlay_big_picture_game_grid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
13 changes: 2 additions & 11 deletions rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include "stdafx.h"
#include "overlay_home_menu_message_box.h"
#include "Emu/system_config.h"

namespace rsx
{
Expand All @@ -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);
Expand Down
11 changes: 11 additions & 0 deletions rpcs3/Emu/RSX/Overlays/overlay_controls.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "Utilities/File.h"
#include "Emu/Cell/timers.hpp"
#include "Loader/ISO.h"
#include "Emu/system_config.h"

#include <numbers>

Expand Down Expand Up @@ -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<std::string, 15> texture_resource_files
Expand Down
4 changes: 4 additions & 0 deletions rpcs3/Emu/RSX/Overlays/overlay_controls.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ namespace rsx
void free_resources();

static std::unique_ptr<image_info> 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
Expand Down
13 changes: 2 additions & 11 deletions rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include "stdafx.h"
#include "overlay_list_view.hpp"
#include "Emu/system_config.h"

namespace rsx
{
Expand Down Expand Up @@ -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);
Expand Down
12 changes: 2 additions & 10 deletions rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
9 changes: 1 addition & 8 deletions rpcs3/Emu/RSX/Overlays/overlay_osk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading