SquareGameLiberationFront/F.E.I.S
1
0
Fork 0
mirror of https://gitlab.com/square-game-liberation-front/F.E.I.S.git synced 2025-03-01 07:50:25 +01:00
Code Releases Wiki Activity

Turn history view into a table

Browse Source
This commit is contained in:
Stepland 2024-03-24 22:36:18 +01:00
parent c902cd54f8
commit accfbc5257
1 changed files with 54 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/history.cpp
View File

@ -1,8 +1,9 @@
#include "history.hpp" #include "history.hpp"
#include <imgui/imgui.h> #include <imgui/imgui.h>
#include "colors.hpp"
#include "colors.hpp"
#include "imgui_extras.hpp"
std::optional<History::item> History::pop_previous() { std::optional<History::item> History::pop_previous() {
if (previous_actions.empty()) { if (previous_actions.empty()) {
@ -34,37 +35,61 @@ void History::push(const History::item& elt) {
} }
void History::display(bool& show) { void History::display(bool& show) {
const auto dot_columns_width = 60.f;
const auto centered_dot = [&](const sf::Color& c){
const auto sz = ImGui::GetTextLineHeight();
const auto pos = ImGui::GetCursorPosX();
ImGui::SetCursorPosX(pos + (dot_columns_width / 2.f) - (sz / 2.f));
feis::ColorDot(c);
};
if (ImGui::Begin("History", &show)) { if (ImGui::Begin("History", &show)) {
for (const auto& it : next_actions | std::views::reverse) { if (ImGui::BeginTable("History", 3, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg)) {
ImGui::TextUnformatted(it->get_message().c_str()); ImGui::TableSetupColumn("Current", ImGuiTableColumnFlags_WidthFixed, 60.f);
if (last_saved_action and std::holds_alternative<item>(*last_saved_action)) { ImGui::TableSetupColumn("Saved", ImGuiTableColumnFlags_WidthFixed, 60.f);
if (std::get<item>(*last_saved_action) == it) { ImGui::TableSetupColumn("Action", ImGuiTableColumnFlags_WidthFixed);
ImGui::SameLine(); ImGui::TableHeadersRow();
ImGui::TextColored(colors::green, "saved");
for (const auto& it : next_actions | std::views::reverse) {
ImGui::TableNextRow();
ImGui::TableSetColumnIndex(2);
ImGui::TextUnformatted(it->get_message().c_str());
if (last_saved_action and std::holds_alternative<item>(*last_saved_action)) {
if (std::get<item>(*last_saved_action) == it) {
ImGui::TableSetColumnIndex(1);
centered_dot(colors::green);
}
} }
} }
}
for (const auto& it : previous_actions) { for (const auto& it : previous_actions) {
ImGui::TextUnformatted(it->get_message().c_str()); ImGui::TableNextRow();
if (it == *previous_actions.cbegin()) { ImGui::TableSetColumnIndex(2);
ImGui::SameLine(); ImGui::TextUnformatted(it->get_message().c_str());
ImGui::TextColored(colors::cyan, "current"); if (it == *previous_actions.cbegin()) {
} ImGui::TableSetColumnIndex(0);
if (last_saved_action and std::holds_alternative<item>(*last_saved_action)) { centered_dot(colors::cyan);
if (std::get<item>(*last_saved_action) == it) { }
ImGui::SameLine(); if (last_saved_action and std::holds_alternative<item>(*last_saved_action)) {
ImGui::TextColored(colors::green, "saved"); if (std::get<item>(*last_saved_action) == it) {
ImGui::TableSetColumnIndex(1);
centered_dot(colors::green);
}
} }
} }
}
ImGui::TextUnformatted("(initial state)"); ImGui::TableNextRow();
if (previous_actions.empty()) { ImGui::TableSetColumnIndex(2);
ImGui::SameLine(); ImGui::TextUnformatted("(initial state)");
ImGui::TextColored(colors::cyan, "current"); if (previous_actions.empty()) {
} ImGui::TableSetColumnIndex(0);
if (last_saved_action and std::holds_alternative<InitialStateSaved>(*last_saved_action)) { centered_dot(colors::cyan);
ImGui::SameLine(); }
ImGui::TextColored(colors::green, "saved"); if (last_saved_action
and std::holds_alternative<InitialStateSaved>(*last_saved_action)) {
ImGui::TableSetColumnIndex(1);
centered_dot(colors::green);
}
ImGui::EndTable();
} }
} }
ImGui::End(); ImGui::End();
@ -74,7 +99,7 @@ void History::mark_as_saved() {
if (not previous_actions.empty()) { if (not previous_actions.empty()) {
last_saved_action = previous_actions.front(); last_saved_action = previous_actions.front();
} else { } else {
last_saved_action = InitialStateSaved{}; last_saved_action = InitialStateSaved {};
} }
} }
@ -90,8 +115,7 @@ bool History::current_state_is_saved() const {
} else { } else {
return false; return false;
} }
} }};
};
return std::visit(is_saved_, *last_saved_action); return std::visit(is_saved_, *last_saved_action);
} }
} }