ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable DXGI handling of ALT+ENTER 

We manage fullscreen ourselves.
This commit is contained in:
Connor McLaughlin 2020-02-24 18:19:20 +09:00
parent bfdf343dfe
commit c68d188029
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/duckstation-qt/d3d11displaywindow.cpp
View File

@ -241,6 +241,10 @@ bool D3D11DisplayWindow::createDeviceContext(QThread* worker_thread, bool debug_
} }
} }
hr = dxgi_factory->MakeWindowAssociation(swap_chain_desc.OutputWindow, DXGI_MWA_NO_WINDOW_CHANGES);
if (FAILED(hr))
Log_WarningPrintf("MakeWindowAssociation() to disable ALT+ENTER failed");
if (debug_device) if (debug_device)
{ {
ComPtr<ID3D11InfoQueue> info; ComPtr<ID3D11InfoQueue> info;

6
src/duckstation-sdl/d3d11_host_display.cpp
View File

@ -2,9 +2,9 @@
#include "common/assert.h" #include "common/assert.h"
#include "common/d3d11/shader_compiler.h" #include "common/d3d11/shader_compiler.h"
#include "common/log.h" #include "common/log.h"
#include "imgui_impl_sdl.h"
#include "frontend-common/display_ps.hlsl.h" #include "frontend-common/display_ps.hlsl.h"
#include "frontend-common/display_vs.hlsl.h" #include "frontend-common/display_vs.hlsl.h"
#include "imgui_impl_sdl.h"
#include <SDL_syswm.h> #include <SDL_syswm.h>
#include <array> #include <array>
#include <dxgi1_5.h> #include <dxgi1_5.h>
@ -241,6 +241,10 @@ bool D3D11HostDisplay::CreateD3DDevice(bool debug_device)
} }
} }
hr = dxgi_factory->MakeWindowAssociation(swap_chain_desc.OutputWindow, DXGI_MWA_NO_WINDOW_CHANGES);
if (FAILED(hr))
Log_WarningPrintf("MakeWindowAssociation() to disable ALT+ENTER failed");
if (debug_device) if (debug_device)
{ {
ComPtr<ID3D11InfoQueue> info; ComPtr<ID3D11InfoQueue> info;