RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-04 22:19:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix gs_frame spawning on monitor other than the one the main window is on (#4029)

Browse source 
* Fix gs_frame spawning on a screen other than the one the RPCS3 window is on for multi-monitor setups

* Cleaned up code & refactored it into a utility function for reuse

* Qt: take gs_frame's framemargins into account by using showEvent
This commit is contained in:
TGEnigma 2018-02-03 20:50:48 +01:00 • committed by Ani
parent cd9bfba790
commit f6b0b31e8b
10 changed files with 112 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

31
rpcs3/rpcs3_app.cpp
View file

@ -1,5 +1,7 @@
#include "rpcs3_app.h"
#include "rpcs3qt/qt_utils.h"
#include "rpcs3qt/welcome_dialog.h"
#include "Emu/System.h"
@ -167,37 +169,40 @@ void rpcs3_app::InitializeCallbacks()
}
bool disableMouse = guiSettings->GetValue(gui::gs_disableMouse).toBool();
auto frame_geometry = gui::utils::create_centered_window_geometry(RPCS3MainWin->geometry(), w, h);
gs_frame* frame;
switch (video_renderer type = g_cfg.video.renderer)
{
case video_renderer::null:
{
gs_frame* ret = new gs_frame("Null", w, h, RPCS3MainWin->GetAppIcon(), disableMouse);
gameWindow = ret;
return std::unique_ptr<gs_frame>(ret);
frame = new gs_frame("Null", frame_geometry, RPCS3MainWin->GetAppIcon(), disableMouse);
break;
}
case video_renderer::opengl:
{
gl_gs_frame* ret = new gl_gs_frame(w, h, RPCS3MainWin->GetAppIcon(), disableMouse);
gameWindow = ret;
return std::unique_ptr<gl_gs_frame>(ret);
frame = new gl_gs_frame(frame_geometry, RPCS3MainWin->GetAppIcon(), disableMouse);
break;
}
case video_renderer::vulkan:
{
gs_frame* ret = new gs_frame("Vulkan", w, h, RPCS3MainWin->GetAppIcon(), disableMouse);
gameWindow = ret;
return std::unique_ptr<gs_frame>(ret);
frame = new gs_frame("Vulkan", frame_geometry, RPCS3MainWin->GetAppIcon(), disableMouse);
break;
}
#ifdef _MSC_VER
case video_renderer::dx12:
{
gs_frame* ret = new gs_frame("DirectX 12", w, h, RPCS3MainWin->GetAppIcon(), disableMouse);
gameWindow = ret;
return std::unique_ptr<gs_frame>(ret);
frame = new gs_frame("DirectX 12", frame_geometry, RPCS3MainWin->GetAppIcon(), disableMouse);
break;
}
#endif
default: fmt::throw_exception("Invalid video renderer: %s" HERE, type);
default:
fmt::throw_exception("Invalid video renderer: %s" HERE, type);
}
gameWindow = frame;
return std::unique_ptr<gs_frame>(frame);
};
callbacks.get_gs_render = []() -> std::shared_ptr<GSRender>