zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-28 23:11:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- a few more fixes.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-22 21:46:22 +02:00
parent 4da2351671
commit 7f83b190cc
4 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/posix/cocoa/i_input.mm
View file

@ -162,7 +162,7 @@ void CheckNativeMouse()
&& (MENU_On == menuactive || MENU_OnNoPause == menuactive); && (MENU_On == menuactive || MENU_OnNoPause == menuactive);
} }
if (!wantNative && primaryLevel->localEventManager->CheckRequireMouse()) if (!wantNative && sysCallbacks && sysCallbacks->WantNativeMouse && sysCallbacks->WantNativeMouse())
wantNative = true; wantNative = true;
I_SetNativeMouse(wantNative); I_SetNativeMouse(wantNative);

1
src/posix/cocoa/st_start.mm
View file

@ -39,6 +39,7 @@
#include "st_console.h" #include "st_console.h"
#include "st_start.h" #include "st_start.h"
#include "printf.h" #include "printf.h"
#include "engineerrors.h"
FStartupScreen *StartScreen; FStartupScreen *StartScreen;

3
src/posix/sdl/i_input.cpp
View file

@ -243,6 +243,9 @@ static void I_CheckNativeMouse ()
bool captureModeInGame = sysCallbacks && sysCallbacks->CaptureModeInGame && sysCallbacks->CaptureModeInGame(); bool captureModeInGame = sysCallbacks && sysCallbacks->CaptureModeInGame && sysCallbacks->CaptureModeInGame();
bool wantNative = !focus || (!use_mouse || GUICapture || !captureModeInGame); bool wantNative = !focus || (!use_mouse || GUICapture || !captureModeInGame);
if (!wantNative && sysCallbacks && sysCallbacks->WantNativeMouse && sysCallbacks->WantNativeMouse())
wantNative = true;
if (wantNative != NativeMouse) if (wantNative != NativeMouse)
{ {
NativeMouse = wantNative; NativeMouse = wantNative;

1
src/posix/sdl/i_system.cpp
View file

@ -53,6 +53,7 @@
#include "cmdlib.h" #include "cmdlib.h"
#include "m_argv.h" #include "m_argv.h"
#include "i_sound.h" #include "i_sound.h"
#include "i_interface.h"
#ifndef NO_GTK #ifndef NO_GTK