diff --git a/src/core/Core/Application.cpp b/src/core/Core/Application.cpp index b233339..c332246 100644 --- a/src/core/Core/Application.cpp +++ b/src/core/Core/Application.cpp @@ -121,7 +121,7 @@ ExitStatus App::Application::run() { if (ImGui::BeginMenu("View")) { ImGui::MenuItem("Some Panel", nullptr, &m_show_some_panel); ImGui::MenuItem("ImGui Demo Panel", nullptr, &m_show_demo_panel); - ImGui::MenuItem("Debug Panel", nullptr, &m_show_debug_panel); + ImGui::MenuItem("Debug Panels", nullptr, &m_show_debug_panel); ImGui::EndMenu(); } @@ -142,7 +142,10 @@ ExitStatus App::Application::run() { // Debug panel if (m_show_debug_panel) { - ImGui::Begin("Debug panel", &m_show_debug_panel); + ImGui::ShowMetricsWindow(); + ImGui::ShowDebugLogWindow(); + + ImGui::Begin("App debug panel", &m_show_debug_panel); ImGui::Text("User config path: %s", user_config_path.c_str()); ImGui::Separator(); ImGui::Text("Font path: %s", font_path.c_str()); diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index 9bece92..d393a4a 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -11,7 +11,7 @@ FetchContent_Declare( FetchContent_Declare( fmt GIT_REPOSITORY "https://github.com/fmtlib/fmt.git" - GIT_TAG 11.0.1 + GIT_TAG 11.0.2 ) FetchContent_Declare( @@ -23,13 +23,13 @@ FetchContent_Declare( FetchContent_Declare( imgui GIT_REPOSITORY "https://github.com/ocornut/imgui.git" - GIT_TAG 527b2c45af2f8964f95826bd16ab7c7ed372ae41 # Branch: docking, date: 02.07.2024, 19:05 GMT+2 + GIT_TAG 68aa9a86ec933510073932980a0940742ecc833c # Branch: docking, date: 10.09.2024, 04:29 GMT+2 ) FetchContent_Declare( SDL2 GIT_REPOSITORY "https://github.com/libsdl-org/SDL.git" - GIT_TAG release-2.30.5 + GIT_TAG release-2.30.7 ) FetchContent_Declare( diff --git a/vendor/imgui-setup/CMakeLists.txt b/vendor/imgui-setup/CMakeLists.txt index 703f650..0e42894 100644 --- a/vendor/imgui-setup/CMakeLists.txt +++ b/vendor/imgui-setup/CMakeLists.txt @@ -1,7 +1,4 @@ -FetchContent_GetProperties(imgui) -if (NOT imgui_POPULATED) - FetchContent_Populate(imgui) -endif () +FetchContent_MakeAvailable(imgui) add_library(imgui ${imgui_SOURCE_DIR}/imgui.cpp ${imgui_SOURCE_DIR}/imgui.h