Skip to content

Fix pressing f11 during init #64

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix pressing f11 during init #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
102a17f
Fix pressing f11 during init
GameParrot Apr 22, 2023
59b605b
Small fix
GameParrot Apr 22, 2023
b26752e
Merge branch 'master' into fullscreen-fix
GameParrot Apr 23, 2023
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 src/core_patches.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void CorePatches::hideMousePointer() {
}

void CorePatches::setFullscreen(void* t, bool fullscreen) {
currentGameWindowCallbacks->setFullscreen(fullscreen);
currentGameWindowCallbacks->setFullscreen(fullscreen, true);
}

void CorePatches::setGameWindow(std::shared_ptr<GameWindow> gameWindow) {
Expand Down
11 changes: 8 additions & 3 deletions src/window_callbacks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,14 @@ void WindowCallbacks::onClose() {
jniSupport.onWindowClosed();
}

void WindowCallbacks::setFullscreen(bool isFs) {
if(fullscreen != isFs) {
void WindowCallbacks::setFullscreen(bool isFs, bool calledFromSymbol) {
if(fullscreen != isFs && !(calledFromSymbol && useLegacyFullscreen && hasUsedLegacyFullscreen)) {
window.setFullscreen(isFs);
fullscreen = isFs;
}
if (calledFromSymbol) {
useLegacyFullscreen = false;
}
}

bool WindowCallbacks::hasInputMode(WindowCallbacks::InputMode want, bool changeMode) {
Expand Down Expand Up @@ -156,8 +159,10 @@ void WindowCallbacks::onKeyboard(KeyCode key, KeyAction action) {
jniSupport.getTextInputHandler().onKeyPressed(key, action);
}

if(key == KeyCode::FN11 && action == KeyAction::PRESS)
if(key == KeyCode::FN11 && action == KeyAction::PRESS && useLegacyFullscreen) {
hasUsedLegacyFullscreen = true;
setFullscreen(!fullscreen);
}

if(useDirectKeyboardInput && (action == KeyAction::PRESS || action == KeyAction::RELEASE)) {
if (Keyboard::useLegacyKeyboard) {
Expand Down
4 changes: 3 additions & 1 deletion src/window_callbacks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ class WindowCallbacks {
bool modCTRL = false;
bool needsQueueGamepadInput = true;
bool fullscreen = options.fullscreen;
bool useLegacyFullscreen = true;
bool hasUsedLegacyFullscreen = false;
bool sendEvents = false;
enum class InputMode {
Touch,
Expand Down Expand Up @@ -52,7 +54,7 @@ class WindowCallbacks {

void onClose();

void setFullscreen(bool isFs);
void setFullscreen(bool isFs, bool calledFromSymbol = false);

void onMouseButton(double x, double y, int btn, MouseButtonAction action);
void onMousePosition(double x, double y);
Expand Down