mirrors/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2025-10-15 22:36:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

[split] rcore, web, desktop, android changes (batch 4) (#3343)

Browse Source 
* Fix ToggleBorderlessWindowed duplicated glfwSetWindowSize calls

* First pass to remove unneeded platform macros for android

* Second pass to remove unneeded platform macros for android

* Remove unneeded platform macros for desktop

* Relocate GetGamepadName and update SetGamepadMappings on android, desktop, web

* Add missing comment to web
This commit is contained in:
ubkp
2023-09-23 18:01:13 -03:00
committed by GitHub
parent d5a780d4d1
commit b3c2ff2905
3 changed files with 32 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/rcore_desktop.c
View File

@@ -711,7 +711,6 @@ void ToggleBorderlessWindowed(void)
glfwGetMonitorPos(monitors[monitor], &monitorPosX, &monitorPosY);
const int monitorWidth = mode->width;
const int monitorHeight = mode->height;
glfwSetWindowSize(CORE.Window.handle, monitorWidth, monitorHeight);
// Set screen position and size
glfwSetWindowPos(CORE.Window.handle, monitorPosX, monitorPosY);
@@ -1150,11 +1149,11 @@ static void ErrorCallback(int error, const char *description)
// Get native window handle
void *GetWindowHandle(void)
{
#if defined(PLATFORM_DESKTOP) && defined(_WIN32)
#if defined(_WIN32)
// NOTE: Returned handle is: void *HWND (windows.h)
return glfwGetWin32Window(CORE.Window.handle);
#endif
#if defined(PLATFORM_DESKTOP) && defined(__linux__)
#if defined(__linux__)
// NOTE: Returned handle is: unsigned long Window (X.h)
// typedef unsigned long XID;
// typedef XID Window;
@@ -1497,16 +1496,6 @@ void OpenURL(const char *url)
}
}
// Get gamepad internal name id
const char *GetGamepadName(int gamepad)
{
const char *name = NULL;
if (CORE.Input.Gamepad.ready[gamepad]) name = glfwGetJoystickName(gamepad);
return name;
}
// Get selected monitor physical width in millimetres
int GetMonitorPhysicalWidth(int monitor)
{
@@ -1523,6 +1512,16 @@ int GetMonitorPhysicalWidth(int monitor)
return 0;
}
// Get gamepad internal name id
const char *GetGamepadName(int gamepad)
{
const char *name = NULL;
if (CORE.Input.Gamepad.ready[gamepad]) name = glfwGetJoystickName(gamepad);
return name;
}
// Get gamepad axis count
int GetGamepadAxisCount(int gamepad)
{