From 91eaed4b37c7cda29103d3478df3e2c6356f8396 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Thu, 29 Aug 2024 15:52:34 +1000 Subject: use snake_case consistently in lua function names --- src/tangara/ui/screen_lua.cpp | 6 +++--- src/tangara/ui/ui_fsm.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/tangara/ui') diff --git a/src/tangara/ui/screen_lua.cpp b/src/tangara/ui/screen_lua.cpp index 301df143..b8d11ed7 100644 --- a/src/tangara/ui/screen_lua.cpp +++ b/src/tangara/ui/screen_lua.cpp @@ -29,7 +29,7 @@ Lua::~Lua() { } auto Lua::onShown() -> void { - callMethod("onShown"); + callMethod("on_show"); forEachBinding([&](lua::Binding* b) { b->active = true; lua::Binding::apply(s_, -1); @@ -37,7 +37,7 @@ auto Lua::onShown() -> void { } auto Lua::onHidden() -> void { - callMethod("onHidden"); + callMethod("on_hide"); forEachBinding([&](lua::Binding* b) { b->active = false; }); } @@ -46,7 +46,7 @@ auto Lua::canPop() -> bool { return true; } lua_rawgeti(s_, LUA_REGISTRYINDEX, *obj_ref_); - lua_pushliteral(s_, "canPop"); + lua_pushliteral(s_, "can_pop"); if (lua_gettable(s_, -2) == LUA_TFUNCTION) { // If we got a callback instead of a value, then invoke it to turn it into diff --git a/src/tangara/ui/ui_fsm.cpp b/src/tangara/ui/ui_fsm.cpp index 669b3298..2009a888 100644 --- a/src/tangara/ui/ui_fsm.cpp +++ b/src/tangara/ui/ui_fsm.cpp @@ -754,7 +754,7 @@ auto Lua::PushLuaScreen(lua_State* s, bool replace) -> int { // Call the constructor for this screen. // lua_settop(s, 1); // Make sure the screen is actually at top of stack - lua_pushliteral(s, "createUi"); + lua_pushliteral(s, "create_ui"); if (lua_gettable(s, 1) == LUA_TFUNCTION) { lua_pushvalue(s, 1); lua::CallProtected(s, 1, 0); -- cgit v1.2.3