PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

add 'istoplevel' argument to input.add_callback

Browse Source
This commit is contained in:
MihailRis 2025-11-16 14:25:16 +03:00
parent 97c8bac9ff
commit bcfdb6196a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/engine/Engine.cpp
View File

@ -70,6 +70,7 @@ void Engine::onContentLoad() {
for (auto& pack : content->getAllContentPacks()) { for (auto& pack : content->getAllContentPacks()) {
auto configFolder = pack.folder / "config"; auto configFolder = pack.folder / "config";
auto bindsFile = configFolder / "bindings.toml"; auto bindsFile = configFolder / "bindings.toml";
logger.info() << "loading bindings: " << bindsFile.string();
if (io::is_regular_file(bindsFile)) { if (io::is_regular_file(bindsFile)) {
input->getBindings().read( input->getBindings().read(
toml::parse( toml::parse(

7
src/logic/scripting/lua/libs/libinput.cpp
View File

@ -50,8 +50,11 @@ static int l_add_callback(lua::State* L) {
handler = input.addKeyCallback(key, actual_callback); handler = input.addKeyCallback(key, actual_callback);
} }
} }
auto callback = [&gui, actual_callback]() -> bool {
if (!gui.isFocusCaught()) { bool isTopLevel = lua::toboolean(L, 4);
auto callback = [&gui, actual_callback, isTopLevel]() -> bool {
if (isTopLevel || !gui.isFocusCaught()) {
return actual_callback(); return actual_callback();
} }
return false; return false;