diff --git a/GlosSITarget/Overlay.cpp b/GlosSITarget/Overlay.cpp index 10658bb..fbc9b55 100644 --- a/GlosSITarget/Overlay.cpp +++ b/GlosSITarget/Overlay.cpp @@ -195,9 +195,12 @@ void Overlay::RemoveOverlayElem(int id) OVERLAY_ELEMS_.erase(id); } -void Overlay::showLogs() const +void Overlay::showLogs() { std::vector logs; + if (!enabled_ && !log_expanded_) { + return; + } if (enabled_) { logs = LOG_MSGS_; } @@ -217,24 +220,26 @@ void Overlay::showLogs() const ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoTitleBar); } else { - ImGui::Begin("Log", nullptr); + log_expanded_ = ImGui::Begin("Log"); + } + if (log_expanded_) { + std::ranges::for_each(LOG_MSGS_, [](const auto& msg) { + switch (msg.level) { + case spdlog::level::warn: + ImGui::TextColored({1.f, 0.8f, 0.f, 1.f}, msg.payload.data()); + break; + case spdlog::level::err: + ImGui::TextColored({.8f, 0.0f, 0.f, 1.f}, msg.payload.data()); + break; + case spdlog::level::debug: + ImGui::TextColored({.8f, 0.8f, 0.8f, .9f}, msg.payload.data()); + break; + default: + ImGui::Text(msg.payload.data()); + } + }); + ImGui::SetScrollY(ImGui::GetScrollMaxY()); } - std::ranges::for_each(LOG_MSGS_, [](const auto& msg) { - switch (msg.level) { - case spdlog::level::warn: - ImGui::TextColored({1.f, 0.8f, 0.f, 1.f}, msg.payload.data()); - break; - case spdlog::level::err: - ImGui::TextColored({.8f, 0.0f, 0.f, 1.f}, msg.payload.data()); - break; - case spdlog::level::debug: - ImGui::TextColored({.8f, 0.8f, 0.8f, .9f}, msg.payload.data()); - break; - default: - ImGui::Text(msg.payload.data()); - } - }); - ImGui::SetScrollY(ImGui::GetScrollMaxY()); ImGui::End(); if (!enabled_) { ImGui::PopStyleVar(); diff --git a/GlosSITarget/Overlay.h b/GlosSITarget/Overlay.h index ffbed6a..cf838ce 100644 --- a/GlosSITarget/Overlay.h +++ b/GlosSITarget/Overlay.h @@ -46,9 +46,10 @@ class Overlay { sf::Clock update_clock_; bool enabled_ = true; std::function on_close_; - void showLogs() const; + void showLogs(); [[nodiscard]] bool closeButton() const; bool force_enable_ = false; + bool log_expanded_ = true; struct Log { std::chrono::system_clock::time_point time; diff --git a/GlosSITarget/Resource.rc b/GlosSITarget/Resource.rc index 85ea85b..0568210 100644 --- a/GlosSITarget/Resource.rc +++ b/GlosSITarget/Resource.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,0,1,003000346323 - PRODUCTVERSION 0,0,1,003000346323 + FILEVERSION 0,0,2,003003750647 + PRODUCTVERSION 0,0,2,003003750647 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +69,12 @@ BEGIN BEGIN VALUE "CompanyName", "Peter Repukat - FlatspotSoftware" VALUE "FileDescription", "GlosSI - SteamTarget" - VALUE "FileVersion", "0.0.1.0-3-ga346323" + VALUE "FileVersion", "0.0.2.0-3-g375c647" VALUE "InternalName", "GlosSITarget" VALUE "LegalCopyright", "Copyright (C) 2021 Peter Repukat - FlatspotSoftware" VALUE "OriginalFilename", "GlosSITarget.exe" VALUE "ProductName", "GlosSI" - VALUE "ProductVersion", "0.0.1.0-3-ga346323" + VALUE "ProductVersion", "0.0.2.0-3-g375c647" END END BLOCK "VarFileInfo" @@ -627,6 +627,10 @@ END + + + +