Skip to content
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

Jump to bottom

Fix android, drm compilation issue on InitWindow #3407

Merged
merged 2 commits into from Oct 13, 2023
Merged

Fix android, drm compilation issue on InitWindow #3407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7057875
Fix drm compilation issue on InitWindow
Oct 13, 2023
c295bee
Fix android compilation issue on InitWindow
Oct 13, 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
10 changes: 5 additions & 5 deletions src/rcore_android.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ void InitWindow(int width, int height, const char *title)
CORE.Window.screen.height = height;
CORE.Window.currentFbo.width = width;
CORE.Window.currentFbo.height = height;

// Set desired windows flags before initializing anything
ANativeActivity_setWindowFlags(platform.app->activity, AWINDOW_FLAG_FULLSCREEN, 0); //AWINDOW_FLAG_SCALED, AWINDOW_FLAG_DITHER

Expand Down Expand Up @@ -228,12 +228,12 @@ void InitWindow(int width, int height, const char *title)

// Initialize base path for storage
CORE.Storage.basePath = platform.app->activity->internalDataPath;

// Set some default window flags
CORE.Window.flags &= ~FLAG_WINDOW_HIDDEN; // false
CORE.Window.flags &= ~FLAG_WINDOW_MINIMIZED); // false
CORE.Window.flags |= FLAG_WINDOW_MAXIMIZED); // true
CORE.Window.flags &= ~FLAG_WINDOW_UNFOCUSED); // false
CORE.Window.flags &= ~FLAG_WINDOW_MINIMIZED; // false
CORE.Window.flags |= FLAG_WINDOW_MAXIMIZED; // true
CORE.Window.flags &= ~FLAG_WINDOW_UNFOCUSED; // false

TRACELOG(LOG_INFO, "PLATFORM: ANDROID: Application initialized successfully");

Expand Down
12 changes: 6 additions & 6 deletions src/rcore_drm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,16 +228,16 @@ void InitWindow(int width, int height, const char *title)

// Set some default window flags
CORE.Window.flags &= ~FLAG_WINDOW_HIDDEN; // false
CORE.Window.flags &= ~FLAG_WINDOW_MINIMIZED); // false
CORE.Window.flags |= FLAG_WINDOW_MAXIMIZED); // true
CORE.Window.flags &= ~FLAG_WINDOW_UNFOCUSED); // false
CORE.Window.flags &= ~FLAG_WINDOW_MINIMIZED; // false
CORE.Window.flags |= FLAG_WINDOW_MAXIMIZED; // true
CORE.Window.flags &= ~FLAG_WINDOW_UNFOCUSED; // false

// Initialize hi-res timer
InitTimer();

// Initialize base path for storage
CORE.Storage.basePath = GetWorkingDirectory();

// Initialize raw input system
InitEvdevInput(); // Evdev inputs initialization
InitGamepad(); // Gamepad init
Expand Down