From 69435dd951be410a30708bda566380ea09513800 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 7 Feb 2023 00:03:21 +0100 Subject: [PATCH] overlays: Fix linux compilation --- rpcs3/Emu/CMakeLists.txt | 7 ++++++- rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.cpp | 3 +++ .../RSX/Overlays/HomeMenu/overlay_home_menu_components.h | 4 ++-- rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp | 2 +- rpcs3/Input/pad_thread.cpp | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt index ce937a1284..4c06529b4c 100644 --- a/rpcs3/Emu/CMakeLists.txt +++ b/rpcs3/Emu/CMakeLists.txt @@ -437,13 +437,18 @@ target_sources(rpcs3_emu PRIVATE RSX/Common/TextureUtils.cpp RSX/Common/texture_cache.cpp RSX/Null/NullGSRender.cpp + RSX/Overlays/HomeMenu/overlay_home_menu.cpp + RSX/Overlays/HomeMenu/overlay_home_menu_components.cpp + RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp + RSX/Overlays/HomeMenu/overlay_home_menu_message_box.cpp + RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp + RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp RSX/Overlays/overlay_animated_icon.cpp RSX/Overlays/overlay_animation.cpp RSX/Overlays/overlay_controls.cpp RSX/Overlays/overlay_cursor.cpp RSX/Overlays/overlay_edit_text.cpp RSX/Overlays/overlay_fonts.cpp - RSX/Overlays/overlay_home_menu.cpp RSX/Overlays/overlay_list_view.cpp RSX/Overlays/overlay_media_list_dialog.cpp RSX/Overlays/overlay_message.cpp diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.cpp index e632911202..a3cccbd636 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.cpp +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.cpp @@ -2,6 +2,9 @@ #include "overlay_home_menu.h" #include "Emu/RSX/RSXThread.h" +#include +#include + namespace rsx { namespace overlays diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.h b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.h index ac6a991552..c3e9adf73f 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.h +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.h @@ -92,11 +92,11 @@ namespace rsx m_dropdown.set_size(available_side_width / 2, element_height); m_dropdown.set_pos(overlay::virtual_width / 2 + menu_entry_margin, 0); m_dropdown.set_font("Arial", 14); - m_dropdown.align_text(this->text_align::center); + m_dropdown.align_text(home_menu_dropdown::text_align::center); m_dropdown.back_color = { 0.3f, 0.3f, 0.3f, 1.0f }; } - compiled_resource& get_compiled() + compiled_resource& get_compiled() override { this->update_value(); diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp index fa40c5b9a6..54cd243155 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp @@ -9,8 +9,8 @@ namespace rsx { home_menu_page::home_menu_page(u16 x, u16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent, const std::string& title) : list_view(width, height, use_separators) - , title(title) , parent(parent) + , title(title) { if (parent) { diff --git a/rpcs3/Input/pad_thread.cpp b/rpcs3/Input/pad_thread.cpp index edb0e72c29..26e1fae37e 100644 --- a/rpcs3/Input/pad_thread.cpp +++ b/rpcs3/Input/pad_thread.cpp @@ -659,7 +659,7 @@ void pad_thread::open_home_menu() return; } - input_log.warning("opening home menu..."); + input_log.notice("opening home menu..."); const error_code result = manager->create()->show([this](s32 status) { @@ -669,5 +669,7 @@ void pad_thread::open_home_menu() send_close_home_menu_cmds(); }); + + (result ? input_log.error : input_log.notice)("opened home menu with result %d", s32{result}); } }