LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 08:11:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge minor into dynamiccore2

Browse Source 
--HG--
branch : dynamiccore2
This commit is contained in:
Bart van Strien
2016-11-26 22:19:12 +01:00
parent de29986d38 cbba8c40a6
commit 24a7a3d367
61 changed files with 4909 additions and 1720 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/window/wrap_Window.cpp
+9 -7
View File
@@ -119,7 +119,7 @@ int w_setMode(lua_State *L)
if (lua_isnoneornil(L, 3))
{
luax_pushboolean(L, instance()->setWindow(w, h, nullptr));
luax_catchexcept(L, [&](){ luax_pushboolean(L, instance()->setWindow(w, h, nullptr)); });
return 1;
}
@@ -266,10 +266,12 @@ int w_setFullscreen(lua_State *L)
return luaL_error(L, "Invalid fullscreen type: %s", typestr);
bool success = false;
if (fstype == Window::FULLSCREEN_MAX_ENUM)
success = instance()->setFullscreen(fullscreen);
else
success = instance()->setFullscreen(fullscreen, fstype);
luax_catchexcept(L, [&]() {
if (fstype == Window::FULLSCREEN_MAX_ENUM)
success = instance()->setFullscreen(fullscreen);
else
success = instance()->setFullscreen(fullscreen, fstype);
});
luax_pushboolean(L, success);
return 1;
@@ -296,9 +298,9 @@ int w_isOpen(lua_State *L)
return 1;
}
int w_close(lua_State * /*L*/)
int w_close(lua_State *L)
{
instance()->close();
luax_catchexcept(L, [&]() { instance()->close(); });
return 0;
}