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

Added love.window.setPosition(x, y [, displayindex]), love.window.getPosition, and optional x and y fields for t.window in love.conf and for the flags table in love.window.set/getMode (resolves issue #930.)

Browse Source
This commit is contained in:
Alex Szpakowski
2014-09-19 16:19:55 -03:00
parent 3d7a3c2c3c
commit b75e1bdeaa
8 changed files with 130 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/window/wrap_Window.cpp
+39
View File
@@ -109,6 +109,16 @@ int w_setMode(lua_State *L)
settings.highdpi = luax_boolflag(L, 3, settingName(Window::SETTING_HIGHDPI), false);
settings.sRGB = luax_boolflag(L, 3, settingName(Window::SETTING_SRGB), false);
lua_getfield(L, 3, settingName(Window::SETTING_X));
lua_getfield(L, 3, settingName(Window::SETTING_Y));
settings.useposition = !(lua_isnoneornil(L, -2) && lua_isnoneornil(L, -1));
if (settings.useposition)
{
settings.x = luaL_optint(L, -2, 0);
settings.y = luaL_optint(L, -1, 0);
}
lua_pop(L, 2);
// We don't explicitly set the refresh rate, it's "read-only".
// For backward-compatibility. TODO: remove!
@@ -178,6 +188,12 @@ int w_getMode(lua_State *L)
lua_pushnumber(L, settings.refreshrate);
lua_setfield(L, -2, settingName(Window::SETTING_REFRESHRATE));
lua_pushinteger(L, settings.x);
lua_setfield(L, -2, settingName(Window::SETTING_X));
lua_pushinteger(L, settings.y);
lua_setfield(L, -2, settingName(Window::SETTING_Y));
return 3;
}
@@ -279,6 +295,27 @@ int w_getDesktopDimensions(lua_State *L)
return 2;
}
int w_setPosition(lua_State *L)
{
int x = luaL_checkint(L, 1);
int y = luaL_checkint(L, 2);
int displayindex = luaL_optint(L, 3, 1) - 1;
instance()->setPosition(x, y, displayindex);
return 0;
}
int w_getPosition(lua_State *L)
{
int x = 0;
int y = 0;
int displayindex = 0;
instance()->getPosition(x, y, displayindex);
lua_pushinteger(L, x);
lua_pushinteger(L, y);
lua_pushinteger(L, displayindex + 1);
return 3;
}
int w_setIcon(lua_State *L)
{
image::ImageData *i = luax_checktype<image::ImageData>(L, 1, "ImageData", IMAGE_IMAGE_DATA_T);
@@ -455,6 +492,8 @@ static const luaL_Reg functions[] =
{ "getHeight", w_getHeight },
{ "getDimensions", w_getDimensions },
{ "getDesktopDimensions", w_getDesktopDimensions },
{ "setPosition", w_setPosition },
{ "getPosition", w_getPosition },
{ "setIcon", w_setIcon },
{ "getIcon", w_getIcon },
{ "setTitle", w_setTitle },