Skip to content

Make Alt+Tab work correctly when in fullscreen #1426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CasualPokePlayer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make Alt+Tab work correctly when in fullscreen #1426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion desktop-ui/input/hotkeys.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ auto InputManager::pollHotkeys() -> void {
if(Application::modal()) return;

if(!driverSettings.inputDefocusAllow.checked()) {
if (!presentation.focused() && !ruby::video.fullScreen()) return;
if (!presentation.focused()) return;
}

for(auto& hotkey : hotkeys) {
Expand Down
2 changes: 1 addition & 1 deletion desktop-ui/program/platform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ auto Program::audio(ares::Node::Audio::Stream node) -> void {

auto Program::input(ares::Node::Input::Input node) -> void {
if(!driverSettings.inputDefocusAllow.checked()) {
if(!ruby::video.fullScreen() && !presentation.focused()) {
if(!presentation.focused()) {
//treat the input as not being active
if(auto button = node->cast<ares::Node::Input::Button>()) button->setValue(0);
if(auto axis = node->cast<ares::Node::Input::Axis>()) axis->setValue(0);
Expand Down
2 changes: 1 addition & 1 deletion desktop-ui/program/program.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ auto Program::main() -> void {
inputManager.poll();
inputManager.pollHotkeys();

bool defocused = driverSettings.inputDefocusPause.checked() && !ruby::video.fullScreen() && !presentation.focused();
bool defocused = driverSettings.inputDefocusPause.checked() && !presentation.focused();
if(emulator && defocused) message.text = "Paused";

if(settings.debugServer.enabled) {
Expand Down
4 changes: 2 additions & 2 deletions ruby/video/direct3d9.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,9 @@ struct VideoDirect3D9 : VideoDriver {
}

if(self.fullScreen) {
_context = _window = CreateWindowEx(WS_EX_TOPMOST, L"VideoDirect3D9_Window", L"", WS_VISIBLE | WS_POPUP,
_context = _window = CreateWindowEx(WS_EX_NOACTIVATE, L"VideoDirect3D9_Window", L"", WS_VISIBLE | WS_POPUP | WS_DISABLED,
_monitorX, _monitorY, _monitorWidth, _monitorHeight,
nullptr, nullptr, GetModuleHandle(0), nullptr);
(HWND)self.context, nullptr, GetModuleHandle(0), nullptr);
} else {
_context = (HWND)self.context;
}
Expand Down
4 changes: 2 additions & 2 deletions ruby/video/gdi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@ struct VideoGDI : VideoDriver {
_monitorHeight = monitor.height;

if(self.fullScreen) {
_context = _window = CreateWindowEx(WS_EX_TOPMOST, L"VideoGDI_Window", L"", WS_VISIBLE | WS_POPUP,
_context = _window = CreateWindowEx(WS_EX_NOACTIVATE, L"VideoGDI_Window", L"", WS_VISIBLE | WS_POPUP | WS_DISABLED,
_monitorX, _monitorY, _monitorWidth, _monitorHeight,
nullptr, nullptr, GetModuleHandle(0), nullptr);
(HWND)self.context, nullptr, GetModuleHandle(0), nullptr);
} else {
_context = (HWND)self.context;
}
Expand Down
4 changes: 2 additions & 2 deletions ruby/video/wgl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,9 @@ struct VideoWGL : VideoDriver, OpenGL {
_monitorHeight = monitor.height;

if(self.fullScreen) {
_context = _window = CreateWindowEx(WS_EX_TOPMOST, L"VideoOpenGL32_Window", L"", WS_VISIBLE | WS_POPUP,
_context = _window = CreateWindowEx(WS_EX_NOACTIVATE, L"VideoOpenGL32_Window", L"", WS_VISIBLE | WS_POPUP | WS_DISABLED,
_monitorX, _monitorY, _monitorWidth, _monitorHeight,
nullptr, nullptr, GetModuleHandle(0), nullptr);
(HWND)self.context, nullptr, GetModuleHandle(0), nullptr);
} else {
_context = (HWND)self.context;
}
Expand Down