diff --git a/CMakeLists.txt b/CMakeLists.txt index c33afec..7f7a491 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ set(OpenGL_MINOR_VERSION 5) # Option to build without the editor set(BUILD_NO_EDITOR 0) -option(NO_EDITOR "Build with no editor" OFF) +option(NO_EDITOR "Building with editor" OFF) if (NO_EDITOR) message(STATUS "Building without the editor") set(BUILD_NO_EDITOR 1) diff --git a/scripts/cmconfig.bat b/scripts/cmconfig.bat index 0313ed3..751f3bc 100644 --- a/scripts/cmconfig.bat +++ b/scripts/cmconfig.bat @@ -1,10 +1,12 @@ @echo off REM This script expects to be run from the parent directory REM ex. scripts/cmconfig.bat -@echo on +@echo off IF "%~1" == "noedit" ( +echo "no editor build" cmake -Wno-dev -DNO_EDITOR=ON -DGLFW_BUILD_DOCS=OFF -B build/ -S . -G "Visual Studio 16 2019" -A x64 ) ELSE ( -cmake -Wno-dev -DGLFW_BUILD_DOCS=OFF -B build/ -S . -G "Visual Studio 16 2019" -A x64 +echo "WITH EDITOR" +cmake -Wno-dev -DNO_EDITOR=OFF -DGLFW_BUILD_DOCS=OFF -B build/ -S . -G "Visual Studio 16 2019" -A x64 ) \ No newline at end of file diff --git a/src/graphics/gui/logGui.cpp b/src/graphics/gui/logGui.cpp index 351198c..fc99a51 100644 --- a/src/graphics/gui/logGui.cpp +++ b/src/graphics/gui/logGui.cpp @@ -90,17 +90,15 @@ namespace lunarium ImGui::SetNextWindowPos(ImVec2(x, y + logHeight), ImGuiCond_Always); ImGui::SetNextWindowSize(ImVec2((width / 3.0f) * 2.0f, logHeight), ImGuiCond_Always); if (!ImGui::Begin("Debug Log", &mbShow, ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove - | ImGuiWindowFlags_NoSavedSettings)) + | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoCollapse)) { + // if (ImGui::IsWindowCollapsed()) + // { + // ImGui::SetWindowPos(ImVec2(0, height - 20), ImGuiCond_Always); + // } ImGui::End(); return; } - - // NOTE: DID not work - // if (ImGui::IsWindowCollapsed()) - // { - // ImGui::SetWindowPos(ImVec2(0, height - 20), ImGuiCond_Always); - // } } else { diff --git a/src/graphics/gui/luaConsole.cpp b/src/graphics/gui/luaConsole.cpp index c28aef6..7070e03 100644 --- a/src/graphics/gui/luaConsole.cpp +++ b/src/graphics/gui/luaConsole.cpp @@ -104,7 +104,7 @@ namespace lunarium ImGui::SetNextWindowPos(ImVec2(x, y), ImGuiCond_Always); ImGui::SetNextWindowSize(ImVec2(width / 3.0f, myHeight + 20), ImGuiCond_Always); if (!ImGui::Begin("LUA Console", &mbShow, ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove - | ImGuiWindowFlags_NoSavedSettings)) + | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoCollapse)) { ImGui::End(); return;