Archive/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-28 13:28:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

overlays/osk: implement horizontal scroll

Browse source
This commit is contained in:
Megamouse 2025-02-27 04:06:39 +01:00
parent 4aa25285a3
commit bd41774960
5 changed files with 42 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/RSX/Overlays/overlay_controls.cpp
View file

@ -596,7 +596,7 @@ namespace rsx
cmd_text.verts = render_text(text.c_str(), static_cast<f32>(x), static_cast<f32>(y)); cmd_text.verts = render_text(text.c_str(), static_cast<f32>(x), static_cast<f32>(y));
if (!cmd_text.verts.empty()) if (!cmd_text.verts.empty())
compiled_resources.add(std::move(compiled_resources_temp), margin_left, margin_top); compiled_resources.add(std::move(compiled_resources_temp), margin_left - horizontal_scroll_offset, margin_top - vertical_scroll_offset);
} }
is_compiled = true; is_compiled = true;

3
rpcs3/Emu/RSX/Overlays/overlay_controls.h
View file

@ -177,6 +177,9 @@ namespace rsx
u16 margin_left = 0; u16 margin_left = 0;
u16 margin_top = 0; u16 margin_top = 0;
f32 horizontal_scroll_offset = 0.0f;
f32 vertical_scroll_offset = 0.0f;
overlay_element() = default; overlay_element() = default;
overlay_element(u16 _w, u16 _h) : w(_w), h(_h) {} overlay_element(u16 _w, u16 _h) : w(_w), h(_h) {}
virtual ~overlay_element() = default; virtual ~overlay_element() = default;

48
rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp
View file

@ -5,24 +5,24 @@ namespace rsx
{ {
namespace overlays namespace overlays
{ {
static usz get_line_start(const std::u32string& text, usz pos) static usz get_line_start(std::u32string_view text, usz pos)
{ {
if (pos == 0) if (pos == 0)
{ {
return 0; return 0;
} }
const usz line_start = text.rfind('\n', pos - 1); const usz line_start = text.rfind('\n', pos - 1);
if (line_start == std::string::npos) if (line_start == umax)
{ {
return 0; return 0;
} }
return line_start + 1; return line_start + 1;
} }
static usz get_line_end(const std::u32string& text, usz pos) static usz get_line_end(std::u32string_view text, usz pos)
{ {
const usz line_end = text.find('\n', pos); const usz line_end = text.find('\n', pos);
if (line_end == std::string::npos) if (line_end == umax)
{ {
return text.length(); return text.length();
} }
@ -198,13 +198,11 @@ namespace rsx
{ {
if (!is_compiled) if (!is_compiled)
{ {
auto& compiled = label::get_compiled(); auto renderer = get_font();
const auto [caret_x, caret_y] = renderer->get_char_offset(text.c_str(), caret_position, clip_text ? w : -1, wrap_text);
overlay_element caret; overlay_element caret;
auto renderer = get_font(); caret.set_pos(static_cast<u16>(caret_x) + padding_left + x, static_cast<u16>(caret_y) + padding_top + y);
const auto caret_loc = renderer->get_char_offset(text.c_str(), caret_position, clip_text ? w : -1, wrap_text);
caret.set_pos(static_cast<u16>(caret_loc.first) + padding_left + x, static_cast<u16>(caret_loc.second) + padding_top + y);
caret.set_size(1, static_cast<u16>(renderer->get_size_px() + 2)); caret.set_size(1, static_cast<u16>(renderer->get_size_px() + 2));
caret.fore_color = fore_color; caret.fore_color = fore_color;
caret.back_color = fore_color; caret.back_color = fore_color;
@ -217,11 +215,39 @@ namespace rsx
m_reset_caret_pulse = false; m_reset_caret_pulse = false;
} }
compiled.add(caret.get_compiled()); // Check if we have to scroll horizontally
// TODO: Vertical scrolling
const s32 available_width = w - padding_left - padding_right;
const f32 offset_right = caret_x + caret.w - available_width;
if (text.empty())
{
// Scroll to the beginning
horizontal_scroll_offset = 0.0f;
}
else if (horizontal_scroll_offset >= caret_x)
{
// Scroll to the left so that the entire caret is visible
horizontal_scroll_offset = caret_x;
}
else if (horizontal_scroll_offset <= offset_right && offset_right > 0.0f)
{
// Scroll to the right so that the entire caret is visible
horizontal_scroll_offset = offset_right;
}
else if (horizontal_scroll_offset > 0.0f && offset_right > 0.0f && caret_position >= text.size())
{
// Scroll to the left so that the entire caret is visible and reveal preceding text
horizontal_scroll_offset = offset_right;
}
horizontal_scroll_offset = std::max(0.0f, horizontal_scroll_offset);
auto& compiled = label::get_compiled();
compiled.add(caret.get_compiled(), -horizontal_scroll_offset, -vertical_scroll_offset);
for (auto& cmd : compiled.draw_commands) for (auto& cmd : compiled.draw_commands)
{ {
// TODO: Scrolling by using scroll offset
cmd.config.clip_region = true; cmd.config.clip_region = true;
cmd.config.clip_rect = {static_cast<f32>(x), static_cast<f32>(y), static_cast<f32>(x + w), static_cast<f32>(y + h)}; cmd.config.clip_rect = {static_cast<f32>(x), static_cast<f32>(y), static_cast<f32>(x + w), static_cast<f32>(y + h)};
} }

1
rpcs3/Emu/RSX/Overlays/overlay_edit_text.hpp
View file

@ -17,7 +17,6 @@ namespace rsx
}; };
usz caret_position = 0; usz caret_position = 0;
u16 vertical_scroll_offset = 0;
bool m_reset_caret_pulse = false; bool m_reset_caret_pulse = false;
bool password_mode = false; bool password_mode = false;

2
rpcs3/Emu/RSX/Overlays/overlay_osk.cpp
View file

@ -435,7 +435,7 @@ namespace rsx
m_preview.set_pos(input_x, input_y + title_height); m_preview.set_pos(input_x, input_y + title_height);
m_preview.set_size(input_w, preview_height); m_preview.set_size(input_w, preview_height);
m_preview.set_padding(get_scaled(15), 0, get_scaled(10), 0); m_preview.set_padding(get_scaled(15), get_scaled(15), get_scaled(10), 0);
const s16 button_y = panel_y + panel_h + button_margin; const s16 button_y = panel_y + panel_h + button_margin;