improved lua console

nem0 · Sep 11, 2023 · 9fc327c · 9fc327c
1 parent 92c9982
commit 9fc327c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/data/editor/scripts/plugins/lua_console.lua b/data/editor/scripts/plugins/lua_console.lua
@@ -104,6 +104,7 @@ plugin.gui = function()
             if ImGui.IsKeyPressed(ImGui.Key_DownArrow, true) then autocomplete_selected_idx += 1 end
             if autocomplete_selected_idx < -1 then autocomplete_selected_idx = 0 end
             if autocomplete_selected_idx >= #suggestions then autocomplete_selected_idx = #suggestions - 1 end
+            if ImGui.IsKeyPressed(ImGui.Key_Escape, false) then ImGui.CloseCurrentPopup() end
             if ImGui.IsKeyPressed(ImGui.Key_Enter, false) then
                 ImGui.CloseCurrentPopup()
                 local k = suggestions[autocomplete_selected_idx + 1]

diff --git a/data/editor/scripts/plugins/lua_type_defs.lua b/data/editor/scripts/plugins/lua_type_defs.lua
@@ -60,6 +60,7 @@ declare ImGui: {
 
 	Key_DownArrow : number,
 	Key_Enter : number,
+	Key_Escape : number,
 	Key_UpArrow : number
 }
 

diff --git a/data/scripts/lumix.d.lua b/data/scripts/lumix.d.lua
@@ -59,6 +59,7 @@ declare ImGui: {
 
 	Key_DownArrow : number,
 	Key_Enter : number,
+	Key_Escape : number,
 	Key_UpArrow : number
 }
 

diff --git a/src/engine/lua_api.cpp b/src/engine/lua_api.cpp
@@ -949,6 +949,7 @@ void registerEngineAPI(lua_State* L, Engine* engine)
 	LuaWrapper::createSystemVariable(L, "ImGui", "StyleVar_WindowPadding", ImGuiStyleVar_WindowPadding);
 	LuaWrapper::createSystemVariable(L, "ImGui", "Key_DownArrow", ImGuiKey_DownArrow);
 	LuaWrapper::createSystemVariable(L, "ImGui", "Key_Enter", ImGuiKey_Enter);
+	LuaWrapper::createSystemVariable(L, "ImGui", "Key_Escape", ImGuiKey_Escape);
 	LuaWrapper::createSystemVariable(L, "ImGui", "Key_UpArrow", ImGuiKey_UpArrow);
 	LuaImGui::registerCFunction(L, "AlignTextToFramePadding", &LuaWrapper::wrap<ImGui::AlignTextToFramePadding>);
 	LuaImGui::registerCFunction(L, "Begin", &LuaImGui::Begin);