better record logging

[blobs.git] / src / ui / ui.cpp

diff --git a/src/ui/ui.cpp b/src/ui/ui.cpp
index 88d128877c3c900cffcbf5da15f4cdc8214dd264..11b63d87f6798d97d01be0d491d253e0a2ccaf63 100644 (file)
--- a/src/ui/ui.cpp
+++ b/src/ui/ui.cpp
@@ -91,6 +91,8 @@ CreaturePanel::CreaturePanel(app::Assets &assets)
                ->Spacing(2)
                ->Direction(Panel::VERTICAL);
        Panel *stat_meter_panel = new Panel;
+       stat_label[0]->Layout();
+       stats[0]->Layout();
        stat_meter_panel
                ->Spacing(stat_label[0]->Size().y - stats[0]->Size().y + 2)
                ->Direction(Panel::VERTICAL);
@@ -241,6 +243,7 @@ void CreaturePanel::Draw(graphics::Viewport &viewport) noexcept {
 
        const glm::vec2 margin(20.0f);
        panel.Position(glm::vec2(viewport.Width() - margin.x - panel.Size().x, margin.y));
+       panel.Layout();
        panel.Draw(assets, viewport);
 }
 
@@ -304,24 +307,7 @@ void RecordsPanel::Draw(graphics::Viewport &viewport) noexcept {
        int i = 0;
        for (const auto &r : sim.Records()) {
                if (!r) continue;
-               switch (r.type) {
-                       default:
-                       case world::Record::VALUE:
-                               records[i]->Text(DecimalString(r.value, 2));
-                               break;
-                       case world::Record::LENGTH:
-                               records[i]->Text(LengthString(r.value));
-                               break;
-                       case world::Record::MASS:
-                               records[i]->Text(MassString(r.value));
-                               break;
-                       case world::Record::PERCENTAGE:
-                               records[i]->Text(PercentageString(r.value));
-                               break;
-                       case world::Record::TIME:
-                               records[i]->Text(TimeString(r.value));
-                               break;
-               }
+               records[i]->Text(r.ValueString());
                std::string str(r.holder->Name());
                bool first = true;
                for (auto p : r.holder->Parents()) {
@@ -339,6 +325,7 @@ void RecordsPanel::Draw(graphics::Viewport &viewport) noexcept {
 
        const glm::vec2 margin(20.0f);
        panel.Position(glm::vec2(margin.x, margin.y));
+       panel.Layout();
        panel.Draw(sim.Assets(), viewport);
 }
 
@@ -388,6 +375,7 @@ void TimePanel::Draw(graphics::Viewport &viewport) noexcept {
 
        const glm::vec2 margin(20.0f);
        panel.Position(glm::vec2(margin.x, viewport.Height() - margin.y - panel.Size().y));
+       panel.Layout();
        panel.Draw(sim.Assets(), viewport);
 }