track a few things

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

diff --git a/src/ui/widgets.cpp b/src/ui/widgets.cpp
index 6d88ad71b46772d7b636c53c6c3e89beee853a30..a81defc0e549cc983795808a71c45988c154e4f7 100644 (file)
--- a/src/ui/widgets.cpp
+++ b/src/ui/widgets.cpp
@@ -7,6 +7,8 @@
 #include "../graphics/Font.hpp"
 #include "../graphics/Viewport.hpp"
 
+#include <iomanip>
+#include <sstream>
 #include <glm/gtx/transform.hpp>
 
 
@@ -60,6 +62,7 @@ glm::vec2 Label::Size() {
 }
 
 void Label::Draw(app::Assets &assets, graphics::Viewport &viewport) noexcept {
+       if (text.empty()) return;
        Update();
        glm::vec2 size = Size();
 
@@ -73,7 +76,7 @@ void Label::Draw(app::Assets &assets, graphics::Viewport &viewport) noexcept {
 }
 
 void Label::Update() {
-       if (!dirty) return;
+       if (!dirty || text.empty()) return;
        font->Render(text, tex);
        dirty = false;
 }
@@ -170,7 +173,7 @@ Panel *Panel::Spacing(float s) {
 
 Panel *Panel::Direction(Dir d) {
        dir = d;
-       Relayout();
+       Layout();
        return this;
 }
 
@@ -180,7 +183,7 @@ glm::vec2 Panel::Size() {
        return (2.0f * padding) + space + size;
 }
 
-void Panel::Relayout() {
+void Panel::Layout() {
        size = glm::vec2(0.0f);
        if (dir == HORIZONTAL) {
                for (auto &w : widgets) {
@@ -198,6 +201,8 @@ void Panel::Relayout() {
 }
 
 void Panel::Draw(app::Assets &assets, graphics::Viewport &viewport) noexcept {
+       // TODO: separate draw and layout, it's inefficient and the wrong tree order anyway
+       Layout();
        if (bg_color.a > 0.0f) {
                assets.shaders.canvas.Activate();
                assets.shaders.canvas.ZIndex(ZIndex());
@@ -205,9 +210,7 @@ void Panel::Draw(app::Assets &assets, graphics::Viewport &viewport) noexcept {
                assets.shaders.canvas.FillRect(Position(), Position() + Size());
        }
 
-       glm::vec2 cursor = Position();
-       cursor.x += padding.x;
-       cursor.y += padding.y;
+       glm::vec2 cursor = Position() + padding;
        for (auto &w : widgets) {
                w->Position(cursor)->ZIndex(ZIndex() + 1.0f);
                w->Draw(assets, viewport);