drifty/emulator
1
0
Fork 0
mirror of https://git.citron-emu.org/citron/emulator synced 2025-12-20 11:03:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Add multiplayer-room-overlay

Browse Source
This commit is contained in:
collecting
2025-10-24 00:09:11 +00:00
parent d76f2faa69
commit 850a9f8f6d
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/citron/main.cpp
View File

@@ -180,6 +180,7 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual
#endif #endif
#include "citron/util/clickable_label.h" #include "citron/util/clickable_label.h"
#include "citron/util/performance_overlay.h" #include "citron/util/performance_overlay.h"
#include "citron/util/multiplayer_room_overlay.h"
#include "citron/util/vram_overlay.h" #include "citron/util/vram_overlay.h"
#include "citron/vk_device_info.h" #include "citron/vk_device_info.h"
@@ -1095,6 +1096,12 @@ void GMainWindow::InitializeWidgets() {
performance_overlay = new PerformanceOverlay(this); performance_overlay = new PerformanceOverlay(this);
performance_overlay->hide(); performance_overlay->hide();
multiplayer_room_overlay = new MultiplayerRoomOverlay(this);
multiplayer_room_overlay->hide();
connect(this, &GMainWindow::EmulationStarting, multiplayer_room_overlay, &MultiplayerRoomOverlay::OnEmulationStarting);
connect(this, &GMainWindow::EmulationStopping, multiplayer_room_overlay, &MultiplayerRoomOverlay::OnEmulationStopping);
vram_overlay = new VramOverlay(this); vram_overlay = new VramOverlay(this);
vram_overlay->hide(); vram_overlay->hide();
@@ -1379,6 +1386,7 @@ void GMainWindow::InitializeHotkeys() {
LinkActionShortcut(ui->action_Show_Status_Bar, QStringLiteral("Toggle Status Bar")); LinkActionShortcut(ui->action_Show_Status_Bar, QStringLiteral("Toggle Status Bar"));
LinkActionShortcut(ui->action_Show_Performance_Overlay, QStringLiteral("Toggle Performance Overlay")); LinkActionShortcut(ui->action_Show_Performance_Overlay, QStringLiteral("Toggle Performance Overlay"));
LinkActionShortcut(ui->action_Show_Vram_Overlay, QStringLiteral("Toggle VRAM Overlay")); LinkActionShortcut(ui->action_Show_Vram_Overlay, QStringLiteral("Toggle VRAM Overlay"));
LinkActionShortcut(ui->action_Show_Multiplayer_Room_Overlay, QStringLiteral("Toggle Multiplayer Room Overlay"));
LinkActionShortcut(ui->action_Fullscreen, QStringLiteral("Fullscreen")); LinkActionShortcut(ui->action_Fullscreen, QStringLiteral("Fullscreen"));
LinkActionShortcut(ui->action_Capture_Screenshot, QStringLiteral("Capture Screenshot")); LinkActionShortcut(ui->action_Capture_Screenshot, QStringLiteral("Capture Screenshot"));
LinkActionShortcut(ui->action_TAS_Start, QStringLiteral("TAS Start/Stop"), true); LinkActionShortcut(ui->action_TAS_Start, QStringLiteral("TAS Start/Stop"), true);
@@ -1608,6 +1616,7 @@ void GMainWindow::ConnectMenuEvents() {
connect_menu(ui->action_Show_Filter_Bar, &GMainWindow::OnToggleFilterBar); connect_menu(ui->action_Show_Filter_Bar, &GMainWindow::OnToggleFilterBar);
connect_menu(ui->action_Show_Status_Bar, &GMainWindow::OnToggleStatusBar); connect_menu(ui->action_Show_Status_Bar, &GMainWindow::OnToggleStatusBar);
connect_menu(ui->action_Show_Performance_Overlay, &GMainWindow::OnTogglePerformanceOverlay); connect_menu(ui->action_Show_Performance_Overlay, &GMainWindow::OnTogglePerformanceOverlay);
connect_menu(ui->action_Show_Multiplayer_Room_Overlay, &GMainWindow::OnToggleMultiplayerRoomOverlay);
connect_menu(ui->action_Show_Vram_Overlay, &GMainWindow::OnToggleVramOverlay); connect_menu(ui->action_Show_Vram_Overlay, &GMainWindow::OnToggleVramOverlay);
connect_menu(ui->action_Toggle_Grid_View, &GMainWindow::OnToggleGridView); connect_menu(ui->action_Toggle_Grid_View, &GMainWindow::OnToggleGridView);
@@ -4930,6 +4939,16 @@ void GMainWindow::OnTogglePerformanceOverlay() {
} }
} }
void GMainWindow::OnToggleMultiplayerRoomOverlay() {
if (multiplayer_room_overlay) {
const bool is_checked = ui->action_Show_Multiplayer_Room_Overlay->isChecked();
multiplayer_room_overlay->SetVisible(is_checked);
// We will add a setting for this later if needed.
// UISettings::values.show_multiplayer_room_overlay = is_checked;
}
}
void GMainWindow::OnToggleVramOverlay() { void GMainWindow::OnToggleVramOverlay() {
if (vram_overlay) { if (vram_overlay) {
const bool is_checked = ui->action_Show_Vram_Overlay->isChecked(); const bool is_checked = ui->action_Show_Vram_Overlay->isChecked();