overlays: Fix linux compilation

RPCS3 · Feb 7, 2023 · 68381be · 68381be
1 parent c96335a
commit 68381be
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git 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
@@ -2,6 +2,9 @@
 #include "overlay_home_menu.h"
 #include "Emu/RSX/RSXThread.h"
 
+#include <sstream>
+#include <iomanip>
+
 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
@@ -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<T>::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
@@ -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
@@ -652,7 +652,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<rsx::overlays::home_menu_dialog>()->show([this](s32 status)
 		{
@@ -662,5 +662,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});
 	}
 }