Fixed the "with editor" build setting in cmconfig.bat

Debug GUI windows can no longer be collapsed
Gui_Panel_Refactor
Joeyrp 4 years ago
parent 5f56810e00
commit 5bd27e5f15

@ -13,7 +13,7 @@ set(OpenGL_MINOR_VERSION 5)
# Option to build without the editor # Option to build without the editor
set(BUILD_NO_EDITOR 0) set(BUILD_NO_EDITOR 0)
option(NO_EDITOR "Build with no editor" OFF) option(NO_EDITOR "Building with editor" OFF)
if (NO_EDITOR) if (NO_EDITOR)
message(STATUS "Building without the editor") message(STATUS "Building without the editor")
set(BUILD_NO_EDITOR 1) set(BUILD_NO_EDITOR 1)

@ -1,10 +1,12 @@
@echo off @echo off
REM This script expects to be run from the parent directory REM This script expects to be run from the parent directory
REM ex. scripts/cmconfig.bat REM ex. scripts/cmconfig.bat
@echo on @echo off
IF "%~1" == "noedit" ( 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 cmake -Wno-dev -DNO_EDITOR=ON -DGLFW_BUILD_DOCS=OFF -B build/ -S . -G "Visual Studio 16 2019" -A x64
) ELSE ( ) 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
) )

@ -90,17 +90,15 @@ namespace lunarium
ImGui::SetNextWindowPos(ImVec2(x, y + logHeight), ImGuiCond_Always); ImGui::SetNextWindowPos(ImVec2(x, y + logHeight), ImGuiCond_Always);
ImGui::SetNextWindowSize(ImVec2((width / 3.0f) * 2.0f, logHeight), ImGuiCond_Always); ImGui::SetNextWindowSize(ImVec2((width / 3.0f) * 2.0f, logHeight), ImGuiCond_Always);
if (!ImGui::Begin("Debug Log", &mbShow, ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove if (!ImGui::Begin("Debug Log", &mbShow, ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove
| ImGuiWindowFlags_NoSavedSettings)) | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoCollapse))
{ {
ImGui::End();
return;
}
// NOTE: DID not work
// if (ImGui::IsWindowCollapsed()) // if (ImGui::IsWindowCollapsed())
// { // {
// ImGui::SetWindowPos(ImVec2(0, height - 20), ImGuiCond_Always); // ImGui::SetWindowPos(ImVec2(0, height - 20), ImGuiCond_Always);
// } // }
ImGui::End();
return;
}
} }
else else
{ {

@ -104,7 +104,7 @@ namespace lunarium
ImGui::SetNextWindowPos(ImVec2(x, y), ImGuiCond_Always); ImGui::SetNextWindowPos(ImVec2(x, y), ImGuiCond_Always);
ImGui::SetNextWindowSize(ImVec2(width / 3.0f, myHeight + 20), ImGuiCond_Always); ImGui::SetNextWindowSize(ImVec2(width / 3.0f, myHeight + 20), ImGuiCond_Always);
if (!ImGui::Begin("LUA Console", &mbShow, ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove if (!ImGui::Begin("LUA Console", &mbShow, ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove
| ImGuiWindowFlags_NoSavedSettings)) | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoCollapse))
{ {
ImGui::End(); ImGui::End();
return; return;

Loading…
Cancel
Save