SpindleyQ/lite-hearted
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Replaced system.set_fullscreen with system.set_window_mode

Browse source 
Solves #24
This commit is contained in:
rxi 2020-04-07 18:48:57 +01:00
parent 2a5a36f64e
commit d4284edd5c
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/core/commands/core.lua
View file

@ -20,7 +20,7 @@ command.add(nil, {
["core:toggle-fullscreen"] = function() ["core:toggle-fullscreen"] = function()
fullscreen = not fullscreen fullscreen = not fullscreen
system.set_fullscreen(fullscreen) system.set_window_mode(fullscreen and "fullscreen" or "normal")
end, end,
["core:reload-module"] = function() ["core:reload-module"] = function()

15
src/api/system.c
View file

@ -161,10 +161,15 @@ static int f_set_window_title(lua_State *L) {
} }
static int f_set_fullscreen(lua_State *L) { static const char *window_opts[] = { "normal", "maximized", "fullscreen", 0 };
luaL_checkany(L, 1); enum { WIN_NORMAL, WIN_MAXIMIZED, WIN_FULLSCREEN };
bool b = lua_toboolean(L, 1);
SDL_SetWindowFullscreen(window, b ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0); static int f_set_window_mode(lua_State *L) {
int n = luaL_checkoption(L, 1, "normal", window_opts);
SDL_SetWindowFullscreen(window,
n == WIN_FULLSCREEN ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
if (n == WIN_NORMAL) { SDL_RestoreWindow(window); }
if (n == WIN_MAXIMIZED) { SDL_MaximizeWindow(window); }
return 0; return 0;
} }
@ -327,7 +332,7 @@ static const luaL_Reg lib[] = {
{ "poll_event", f_poll_event }, { "poll_event", f_poll_event },
{ "set_cursor", f_set_cursor }, { "set_cursor", f_set_cursor },
{ "set_window_title", f_set_window_title }, { "set_window_title", f_set_window_title },
{ "set_fullscreen", f_set_fullscreen }, { "set_window_mode", f_set_window_mode },
{ "window_has_focus", f_window_has_focus }, { "window_has_focus", f_window_has_focus },
{ "show_confirm_dialog", f_show_confirm_dialog }, { "show_confirm_dialog", f_show_confirm_dialog },
{ "list_dir", f_list_dir }, { "list_dir", f_list_dir },