RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-26 04:32:35 +01:00
Code Issues Releases Wiki Activity

overlays/osk: Do not render preview background in separate windows mode

Browse Source
This commit is contained in:
Megamouse 2023-01-24 00:30:23 +01:00
parent feb04c64a8
commit 3d99fea575
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -849,6 +849,8 @@ namespace rsx
// Make sure to show the dialog and send necessary events // Make sure to show the dialog and send necessary events
set_visible(true); set_visible(true);
std::lock_guard lock(m_preview_mutex);
const bool use_key_string_fallback = !key.empty(); const bool use_key_string_fallback = !key.empty();
osk.notice("osk_dialog::on_key_pressed(led=%d, mkey=%d, key_code=%d, out_key_code=%d, pressed=%d, use_key_string_fallback=%d)", led, mkey, key_code, out_key_code, pressed, use_key_string_fallback); osk.notice("osk_dialog::on_key_pressed(led=%d, mkey=%d, key_code=%d, out_key_code=%d, pressed=%d, use_key_string_fallback=%d)", led, mkey, key_code, out_key_code, pressed, use_key_string_fallback);
@ -1114,21 +1116,23 @@ namespace rsx
if (m_use_separate_windows && !m_show_panel) if (m_use_separate_windows && !m_show_panel)
{ {
m_cached_resource.add(m_input_frame.get_compiled()); std::lock_guard lock(m_preview_mutex);
m_cached_resource.add(m_preview.get_compiled()); m_cached_resource.add(m_preview.get_compiled());
} }
else else
{ {
m_cached_resource.add(m_input_frame.get_compiled());
m_cached_resource.add(m_panel_frame.get_compiled()); m_cached_resource.add(m_panel_frame.get_compiled());
if (!m_use_separate_windows) if (!m_use_separate_windows)
{ {
// The title is omitted in separate window mode // The title is omitted in separate window mode
m_cached_resource.add(m_input_frame.get_compiled());
m_cached_resource.add(m_title.get_compiled()); m_cached_resource.add(m_title.get_compiled());
} }
{
std::lock_guard lock(m_preview_mutex);
m_cached_resource.add(m_preview.get_compiled()); m_cached_resource.add(m_preview.get_compiled());
}
m_cached_resource.add(m_btn_accept.get_compiled()); m_cached_resource.add(m_btn_accept.get_compiled());
m_cached_resource.add(m_btn_cancel.get_compiled()); m_cached_resource.add(m_btn_cancel.get_compiled());
m_cached_resource.add(m_btn_shift.get_compiled()); m_cached_resource.add(m_btn_shift.get_compiled());