mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-29 22:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

overlays/osk: align osk position

Browse Source
This commit is contained in:
Megamouse 2023-01-18 22:30:00 +01:00
parent 3d78c7f43a
commit 6b4208be9b
4 changed files with 102 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
View File

@ -82,6 +82,8 @@ struct osk_info
atomic_t<f32> initial_scale = 1.0f; atomic_t<f32> initial_scale = 1.0f;
atomic_t<u32> layout_mode = CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT | CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP; atomic_t<u32> layout_mode = CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT | CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP;
atomic_t<u32> x_align = CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT;
atomic_t<u32> y_align = CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP;
atomic_t<CellOskDialogContinuousMode> osk_continuous_mode = CELL_OSKDIALOG_CONTINUOUS_MODE_NONE; atomic_t<CellOskDialogContinuousMode> osk_continuous_mode = CELL_OSKDIALOG_CONTINUOUS_MODE_NONE;
atomic_t<u32> last_dialog_state = CELL_SYSUTIL_OSKDIALOG_UNLOADED; // Used for continuous seperate window dialog atomic_t<u32> last_dialog_state = CELL_SYSUTIL_OSKDIALOG_UNLOADED; // Used for continuous seperate window dialog
@ -114,6 +116,8 @@ struct osk_info
pointer_pos = {0.0f, 0.0f}; pointer_pos = {0.0f, 0.0f};
initial_scale = 1.0f; initial_scale = 1.0f;
layout_mode = CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT | CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP; layout_mode = CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT | CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP;
x_align = CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT;
y_align = CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP;
osk_continuous_mode = CELL_OSKDIALOG_CONTINUOUS_MODE_NONE; osk_continuous_mode = CELL_OSKDIALOG_CONTINUOUS_MODE_NONE;
last_dialog_state = CELL_SYSUTIL_OSKDIALOG_UNLOADED; last_dialog_state = CELL_SYSUTIL_OSKDIALOG_UNLOADED;
osk_confirm_callback.store({}); osk_confirm_callback.store({});
@ -540,6 +544,8 @@ error_code cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dia
.panel_flag = allowOskPanelFlg, .panel_flag = allowOskPanelFlg,
.support_language = info.supported_languages, .support_language = info.supported_languages,
.first_view_panel = firstViewPanel, .first_view_panel = firstViewPanel,
.x_align = info.x_align,
.y_align = info.y_align,
.base_color = info.base_color.load(), .base_color = info.base_color.load(),
.dimmer_enabled = info.dimmer_enabled.load(), .dimmer_enabled = info.dimmer_enabled.load(),
.intercept_input = false .intercept_input = false
@ -848,13 +854,43 @@ error_code cellOskDialogAddSupportLanguage(u32 supportLanguage)
error_code cellOskDialogSetLayoutMode(s32 layoutMode) error_code cellOskDialogSetLayoutMode(s32 layoutMode)
{ {
cellOskDialog.todo("cellOskDialogSetLayoutMode(layoutMode=%d)", layoutMode); cellOskDialog.todo("cellOskDialogSetLayoutMode(layoutMode=0x%x)", layoutMode);
// TODO: error checks // TODO: error checks
g_fxo->get<osk_info>().layout_mode = layoutMode; auto& osk = g_fxo->get<osk_info>();
osk.layout_mode = layoutMode;
// TODO: use layout mode // Choose alignments, since the devs didn't make them exclusive for some reason.
// Let's prefer a centered alignment.
// Align horizontally
if (layoutMode & CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_CENTER)
{
osk.x_align = CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_CENTER;
}
else if (layoutMode & CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT)
{
osk.x_align = CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT;
}
else
{
osk.x_align = CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_RIGHT;
}
// Align vertically
if (layoutMode & CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_CENTER)
{
osk.y_align = CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_CENTER;
}
else if (layoutMode & CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP)
{
osk.y_align = CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP;
}
else
{
osk.y_align = CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_BOTTOM;
}
return CELL_OK; return CELL_OK;
} }

2
rpcs3/Emu/Cell/Modules/cellOskDialog.h
View File

@ -271,6 +271,8 @@ public:
u32 panel_flag = 0; u32 panel_flag = 0;
u32 support_language = 0; u32 support_language = 0;
u32 first_view_panel = 0; u32 first_view_panel = 0;
u32 x_align = 0;
u32 y_align = 0;
color base_color{}; color base_color{};
bool dimmer_enabled = false; bool dimmer_enabled = false;
bool intercept_input = false; bool intercept_input = false;

85
rpcs3/Emu/RSX/Overlays/overlay_osk.cpp
View File

@ -218,10 +218,41 @@ namespace rsx
const u16 preview_height = (flags & CELL_OSKDIALOG_NO_RETURN) ? 40 : 90; const u16 preview_height = (flags & CELL_OSKDIALOG_NO_RETURN) ? 40 : 90;
// Place elements with absolute positioning // Place elements with absolute positioning
constexpr u16 margin = 100;
constexpr u16 button_margin = 30;
constexpr u16 button_height = 30;
const u16 frame_w = static_cast<u16>(num_columns * cell_size_x); const u16 frame_w = static_cast<u16>(num_columns * cell_size_x);
const u16 frame_h = static_cast<u16>(num_rows * cell_size_y) + 30 + preview_height; const u16 frame_h = static_cast<u16>(num_rows * cell_size_y) + 30 + preview_height;
const u16 frame_x = (1280 - frame_w) / 2; u16 frame_x = 0;
const u16 frame_y = (720 - frame_h) / 2; u16 frame_y = 0;
switch (m_x_align)
{
case CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_LEFT:
frame_x = margin;
break;
case CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_RIGHT:
frame_x = virtual_width - (frame_w + margin);
break;
case CELL_OSKDIALOG_LAYOUTMODE_X_ALIGN_CENTER:
default:
frame_x = (virtual_width - frame_w) / 2;
break;
}
switch (m_y_align)
{
case CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_TOP:
frame_y = margin;
break;
case CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_BOTTOM:
frame_y = virtual_height - (frame_h + button_height + button_margin + margin);
break;
case CELL_OSKDIALOG_LAYOUTMODE_Y_ALIGN_CENTER:
default:
frame_y = (virtual_height - (frame_h + button_height + button_margin)) / 2;
break;
}
m_frame.set_pos(frame_x, frame_y); m_frame.set_pos(frame_x, frame_y);
m_frame.set_size(frame_w, frame_h); m_frame.set_size(frame_w, frame_h);
@ -234,28 +265,28 @@ namespace rsx
m_preview.set_size(frame_w, preview_height); m_preview.set_size(frame_w, preview_height);
m_preview.set_padding(15, 0, 10, 0); m_preview.set_padding(15, 0, 10, 0);
m_btn_cancel.set_pos(frame_x, frame_y + frame_h + 10); m_btn_cancel.set_pos(frame_x, frame_y + frame_h + button_margin);
m_btn_cancel.set_size(140, 30); m_btn_cancel.set_size(140, button_height);
m_btn_cancel.set_text(localized_string_id::RSX_OVERLAYS_OSK_DIALOG_CANCEL); m_btn_cancel.set_text(localized_string_id::RSX_OVERLAYS_OSK_DIALOG_CANCEL);
m_btn_cancel.set_text_vertical_adjust(5); m_btn_cancel.set_text_vertical_adjust(5);
m_btn_space.set_pos(frame_x + 100, frame_y + frame_h + 10); m_btn_space.set_pos(frame_x + 100, frame_y + frame_h + button_margin);
m_btn_space.set_size(100, 30); m_btn_space.set_size(100, button_height);
m_btn_space.set_text(localized_string_id::RSX_OVERLAYS_OSK_DIALOG_SPACE); m_btn_space.set_text(localized_string_id::RSX_OVERLAYS_OSK_DIALOG_SPACE);
m_btn_space.set_text_vertical_adjust(5); m_btn_space.set_text_vertical_adjust(5);
m_btn_delete.set_pos(frame_x + 200, frame_y + frame_h + 10); m_btn_delete.set_pos(frame_x + 200, frame_y + frame_h + button_margin);
m_btn_delete.set_size(100, 30); m_btn_delete.set_size(100, button_height);
m_btn_delete.set_text(localized_string_id::RSX_OVERLAYS_OSK_DIALOG_BACKSPACE); m_btn_delete.set_text(localized_string_id::RSX_OVERLAYS_OSK_DIALOG_BACKSPACE);
m_btn_delete.set_text_vertical_adjust(5); m_btn_delete.set_text_vertical_adjust(5);
m_btn_shift.set_pos(frame_x + 320, frame_y + frame_h + 10); m_btn_shift.set_pos(frame_x + 320, frame_y + frame_h + button_margin);
m_btn_shift.set_size(80, 30); m_btn_shift.set_size(80, button_height);
m_btn_shift.set_text(localized_string_id::RSX_OVERLAYS_OSK_DIALOG_SHIFT); m_btn_shift.set_text(localized_string_id::RSX_OVERLAYS_OSK_DIALOG_SHIFT);
m_btn_shift.set_text_vertical_adjust(5); m_btn_shift.set_text_vertical_adjust(5);
m_btn_accept.set_pos(frame_x + 400, frame_y + frame_h + 10); m_btn_accept.set_pos(frame_x + 400, frame_y + frame_h + button_margin);
m_btn_accept.set_size(100, 30); m_btn_accept.set_size(100, button_height);
m_btn_accept.set_text(localized_string_id::RSX_OVERLAYS_OSK_DIALOG_ACCEPT); m_btn_accept.set_text(localized_string_id::RSX_OVERLAYS_OSK_DIALOG_ACCEPT);
m_btn_accept.set_text_vertical_adjust(5); m_btn_accept.set_text_vertical_adjust(5);
@ -264,7 +295,7 @@ namespace rsx
void osk_dialog::initialize_layout(const std::u32string& title, const std::u32string& initial_text) void osk_dialog::initialize_layout(const std::u32string& title, const std::u32string& initial_text)
{ {
m_background.set_size(1280, 720); m_background.set_size(virtual_width, virtual_height);
m_title.set_unicode_text(title); m_title.set_unicode_text(title);
m_title.back_color.a = 0.7f; // Uses the dimmed color of the frame background m_title.back_color.a = 0.7f; // Uses the dimmed color of the frame background
@ -845,16 +876,16 @@ namespace rsx
m_cached_resource.add(m_btn_delete.get_compiled()); m_cached_resource.add(m_btn_delete.get_compiled());
overlay_element tmp; overlay_element tmp;
label m_label; u16 buffered_cell_count = 0;
u16 buffered_cell_count = 0; bool render_label = false;
bool render_label = false;
const color4f disabled_back_color = { 0.3f, 0.3f, 0.3f, 1.f }; const color4f disabled_back_color = { 0.3f, 0.3f, 0.3f, 1.f };
const color4f disabled_fore_color = { 0.8f, 0.8f, 0.8f, 1.f }; const color4f disabled_fore_color = { 0.8f, 0.8f, 0.8f, 1.f };
const color4f normal_fore_color = { 0.f, 0.f, 0.f, 1.f }; const color4f normal_fore_color = { 0.f, 0.f, 0.f, 1.f };
m_label.back_color = { 0.f, 0.f, 0.f, 0.f }; label label;
m_label.set_padding(0, 0, 10, 0); label.back_color = { 0.f, 0.f, 0.f, 0.f };
label.set_padding(0, 0, 10, 0);
if (m_reset_pulse) if (m_reset_pulse)
{ {
@ -892,13 +923,13 @@ namespace rsx
const u16 offset_x = static_cast<u16>(buffered_cell_count * cell_size_x); const u16 offset_x = static_cast<u16>(buffered_cell_count * cell_size_x);
const u16 full_width = static_cast<u16>(offset_x + cell_size_x); const u16 full_width = static_cast<u16>(offset_x + cell_size_x);
m_label.set_pos(x - offset_x, y); label.set_pos(x - offset_x, y);
m_label.set_size(full_width, cell_size_y); label.set_size(full_width, cell_size_y);
m_label.fore_color = c.enabled ? normal_fore_color : disabled_fore_color; label.fore_color = c.enabled ? normal_fore_color : disabled_fore_color;
const auto _z = (selected_z < output_count) ? selected_z : output_count - 1u; const auto _z = (selected_z < output_count) ? selected_z : output_count - 1u;
m_label.set_unicode_text(c.outputs[m_selected_charset][_z]); label.set_unicode_text(c.outputs[m_selected_charset][_z]);
m_label.align_text(rsx::overlays::overlay_element::text_align::center); label.align_text(rsx::overlays::overlay_element::text_align::center);
render_label = true; render_label = true;
} }
} }
@ -926,9 +957,9 @@ namespace rsx
if (render_label) if (render_label)
{ {
m_label.pulse_effect_enabled = c.selected; label.pulse_effect_enabled = c.selected;
m_label.pulse_sinus_offset = m_key_pulse_cache.pulse_sinus_offset; label.pulse_sinus_offset = m_key_pulse_cache.pulse_sinus_offset;
m_cached_resource.add(m_label.get_compiled()); m_cached_resource.add(label.get_compiled());
} }
} }
@ -950,6 +981,8 @@ namespace rsx
state = OskDialogState::Open; state = OskDialogState::Open;
flags = params.prohibit_flags; flags = params.prohibit_flags;
char_limit = params.charlimit; char_limit = params.charlimit;
m_x_align = params.x_align;
m_y_align = params.y_align;
m_frame.back_color.r = params.base_color.r; m_frame.back_color.r = params.base_color.r;
m_frame.back_color.g = params.base_color.g; m_frame.back_color.g = params.base_color.g;
m_frame.back_color.b = params.base_color.b; m_frame.back_color.b = params.base_color.b;

2
rpcs3/Emu/RSX/Overlays/overlay_osk.h
View File

@ -38,6 +38,8 @@ namespace rsx
}; };
// Base UI // Base UI
u32 m_x_align = 0;
u32 m_y_align = 0;
overlay_element m_frame; overlay_element m_frame;
overlay_element m_background; overlay_element m_background;
label m_title; label m_title;