From e1a359071ee2a53940b53fd477bc2998d35f2583 Mon Sep 17 00:00:00 2001 From: Yadciel Date: Sat, 14 Dec 2024 00:37:16 +0100 Subject: [PATCH] =?UTF-8?q?fenster=20k=C3=B6nnen=20erstellt=20werden?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- lib/fltk | 2 +- lib/moonfltk | 2 +- src/toolboxWindow.cpp | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 13e807e..2444bf0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,7 @@ file(GLOB_RECURSE SOURCES "src/*.cpp" "inc/*.h") add_executable(Toolbox main.cpp ${SOURCES} ${RESOURCE_FILES} ${PLATFORM_SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE "out_embed") -target_link_libraries(Toolbox PRIVATE saucer::saucer sol2::sol2 tray nlohmann_json cppcodec fltk::fltk moonfltk lua) +target_link_libraries(Toolbox PRIVATE saucer::saucer sol2::sol2 tray nlohmann_json cppcodec fltk moonfltk lua) if(WIN32 AND (CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")) set_target_properties(Toolbox PROPERTIES WIN32_EXECUTABLE TRUE) diff --git a/lib/fltk b/lib/fltk index 34b5fe9..6835b94 160000 --- a/lib/fltk +++ b/lib/fltk @@ -1 +1 @@ -Subproject commit 34b5fe9e92a560d0507838c3dc1c6c3fd19648f9 +Subproject commit 6835b94a47e1b0c9d00dcb5bc57c91906ae1659f diff --git a/lib/moonfltk b/lib/moonfltk index 8c63723..3b63ccd 160000 --- a/lib/moonfltk +++ b/lib/moonfltk @@ -1 +1 @@ -Subproject commit 8c63723dbbc85e41be97e3a4685ab66e4ea72e7b +Subproject commit 3b63ccd8f746780fbc67f2d71ec2232c4637319a diff --git a/src/toolboxWindow.cpp b/src/toolboxWindow.cpp index 10c2ac1..a034bc4 100644 --- a/src/toolboxWindow.cpp +++ b/src/toolboxWindow.cpp @@ -261,10 +261,13 @@ void ToolboxWindow::run_lua(int id) { try { std::string scriptPath = m_toolboxItems[id].lua_script; lua.script_file(scriptPath); + m_webview.execute("enableButtonByToolId({})",saucer::make_args(id)); m_webview.reload(); } catch (const sol::error& e) { std::cerr << "Lua error: " << e.what() << std::endl; + m_webview.execute("enableButtonByToolId({})",saucer::make_args(id)); + m_webview.reload(); } };