diff --git a/src/gui/lua/lua_api_version.h b/src/gui/lua/lua_api_version.h index 55b19f4e0..5787eb162 100644 --- a/src/gui/lua/lua_api_version.h +++ b/src/gui/lua/lua_api_version.h @@ -4,4 +4,4 @@ * to luainstance.h changes */ #define LUA_API_VERSION_MAJOR 1 -#define LUA_API_VERSION_MINOR 70 +#define LUA_API_VERSION_MINOR 71 diff --git a/src/gui/lua/lua_cc_window.cpp b/src/gui/lua/lua_cc_window.cpp index 2225797bc..819fe18d2 100644 --- a/src/gui/lua/lua_cc_window.cpp +++ b/src/gui/lua/lua_cc_window.cpp @@ -220,7 +220,10 @@ int CLuaInstCCWindow::CCWindowSetCaption(lua_State *L) std::string name = ""; tableLookup(L, "name", name) || tableLookup(L, "title", name) || tableLookup(L, "caption", name); - D->w->setWindowCaption(name); + lua_Integer alignment = (lua_Integer)CTextBox::NO_AUTO_LINEBREAK; + tableLookup(L, "alignment", alignment); + + D->w->setWindowCaption(name, alignment | (lua_Integer)CTextBox::NO_AUTO_LINEBREAK); return 0; } diff --git a/src/gui/lua/luainstance.cpp b/src/gui/lua/luainstance.cpp index 9adfa1d4e..1ff783904 100644 --- a/src/gui/lua/luainstance.cpp +++ b/src/gui/lua/luainstance.cpp @@ -383,22 +383,35 @@ static void set_lua_variables(lua_State *L) { NULL, 0 } }; + /* + * possible text allignment modes usable for window header caption + * API: >= v1.71 + */ + table_key text_alignment[] = + { + { "DEFAULT", (lua_Integer)CTextBox::NO_AUTO_LINEBREAK}, + { "CENTER", (lua_Integer)CTextBox::CENTER}, + { "RIGHT", (lua_Integer)CTextBox::RIGHT}, + { NULL, 0 } + }; + /* list of environment variable arrays to be exported */ lua_envexport e[] = { - { "RC", keyname }, - { "SCREEN", screenopts }, - { "FONT", fontlist }, - { "CORNER", corners }, - { "OFFSET", offsets }, - { "MENU_RETURN", menureturn }, - { "APIVERSION", apiversion }, - { "PLAYSTATE", playstate }, - { "CC", ccomponents }, - { "DYNFONT", dynfont }, - { "CURL", curl_status }, - { "NMODE", neutrino_mode }, - { "POSTMSG", post_msg }, + { "RC", keyname }, + { "SCREEN", screenopts }, + { "FONT", fontlist }, + { "CORNER", corners }, + { "OFFSET", offsets }, + { "MENU_RETURN", menureturn }, + { "APIVERSION", apiversion }, + { "PLAYSTATE", playstate }, + { "CC", ccomponents }, + { "DYNFONT", dynfont }, + { "CURL", curl_status }, + { "NMODE", neutrino_mode }, + { "POSTMSG", post_msg }, + { "TEXT_ALIGNMENT", text_alignment }, { NULL, NULL } };