Sidebar option to reopen Qt interface

Author: BeezBumba

rpcs3/Emu/RSX/Overlays/BigPicture/overlay_big_picture_main_menu.cpp

@@ -2,6 +2,7 @@
 #include "overlay_big_picture_main_menu.h"
 #include "overlay_big_picture_game_grid.h"
 #include "Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h"
+#include "Emu/System.h"
 
 namespace rsx
 {
@@ -16,6 +17,19 @@ namespace rsx
 
 			add_page(home_menu::fa_icon::settings, std::make_shared<home_menu_settings>(x, y, width, height, false, this));
 
+			add_item(home_menu::fa_icon::video, get_localized_string(localized_string_id::BIG_PICTURE_MENU_OPEN_INTERFACE), [](pad_button btn) -> page_navigation
+			{
+				if (btn != pad_button::cross) return page_navigation::stay;
+
+				// Just bring the Qt window back, Big Picture Mode itself keeps running underneath it.
+				Emu.CallFromMainThread([]()
+				{
+					Emu.GetCallbacks().show_main_window(true);
+				});
+
+				return page_navigation::stay;
+			});
+
 			add_item(home_menu::fa_icon::poweroff, get_localized_string(localized_string_id::BIG_PICTURE_MENU_EXIT), [](pad_button btn) -> page_navigation
 			{
 				if (btn != pad_button::cross) return page_navigation::stay;

rpcs3/Emu/localized_string_id.h

@@ -351,6 +351,7 @@ enum class localized_string_id
 
 	BIG_PICTURE_MODE_TITLE,
 	BIG_PICTURE_MENU_GAMES,
+	BIG_PICTURE_MENU_OPEN_INTERFACE,
 	BIG_PICTURE_MENU_EXIT,
 	BIG_PICTURE_NO_GAMES_FOUND,
 	BIG_PICTURE_GAME_DETAILS_START,

rpcs3/rpcs3qt/gui_application.cpp

@@ -885,9 +885,19 @@ void gui_application::InitializeCallbacks()
 	{
 		Emu.CallFromMainThread([this, visible]()
 		{
-			if (m_main_window)
+			if (!m_main_window)
+			{
+				return;
+			}
+
+			m_main_window->setVisible(visible);
+
+			if (visible)
 			{
-				m_main_window->setVisible(visible);
+				// Bring it above the Big Picture Mode / game render surface, best-effort:
+				// a true exclusive-fullscreen render window can still occlude it on some platforms.
+				m_main_window->raise();
+				m_main_window->activateWindow();
 			}
 		});
 	};

rpcs3/rpcs3qt/localized_emu.h

@@ -366,6 +366,7 @@ class localized_emu : public QObject
 		case localized_string_id::SAVESTATE_FAILED_DUE_TO_SPU: return tr("SaveState failed: Failed to lock SPU state, using SPU ASMJIT will fix it.");
 		case localized_string_id::BIG_PICTURE_MODE_TITLE: return tr("Big Picture Mode");
 		case localized_string_id::BIG_PICTURE_MENU_GAMES: return tr("Games");
+		case localized_string_id::BIG_PICTURE_MENU_OPEN_INTERFACE: return tr("Open QT Interface");
 		case localized_string_id::BIG_PICTURE_MENU_EXIT: return tr("Exit Big Picture Mode");
 		case localized_string_id::BIG_PICTURE_NO_GAMES_FOUND: return tr("No games found.\nAdd games in the main RPCS3 window.");
 		case localized_string_id::BIG_PICTURE_GAME_DETAILS_START: return tr("Start");