From b7cfa4db2d4dff70cbd8aa02f7a8eee2f0a3b63e Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Tue, 22 Jul 2025 15:55:05 -0400
Subject: [PATCH 01/13] Icons now scale via aspect ratio, but it's still not as
 robust as it should be.  I also think that Sprite should just work this way
 or stretch if an option is given, which would make Icon kind of pointless.

---
 src/guecs/sfml/components.cpp | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/guecs/sfml/components.cpp b/src/guecs/sfml/components.cpp
index 064cc3a..52c86cd 100644
--- a/src/guecs/sfml/components.cpp
+++ b/src/guecs/sfml/components.cpp
@@ -45,19 +45,16 @@ namespace guecs {
 
   void Sprite::init(lel::Cell &cell) {
     auto sprite_texture = BACKEND->get_sprite(name);
+    auto bounds = sprite_texture.frame_size;
 
-    sf::IntRect rect{{0,0},sprite_texture.frame_size};
+    sf::IntRect rect{{0,0}, bounds};
     sprite = make_shared<sf::Sprite>(*sprite_texture.texture, rect);
 
-    sprite->setPosition({
-        float(cell.x + padding),
-        float(cell.y + padding)});
-
-    auto bounds = sprite->getLocalBounds();
+    sprite->setPosition({float(cell.x + padding), float(cell.y + padding)});
 
     sprite->setScale({
-        float(cell.w - padding * 2) / bounds.size.x,
-        float(cell.h - padding * 2) / bounds.size.y});
+        float(cell.w - padding * 2) / float(bounds.x),
+        float(cell.h - padding * 2) / float(bounds.y)});
   }
 
   void Sprite::render(sf::RenderWindow& window, sf::Shader *shader_ptr) {
@@ -75,21 +72,25 @@ namespace guecs {
 
   void Icon::init(lel::Cell &cell) {
     auto sprite_texture = BACKEND->get_icon(name);
+    auto bounds = sprite_texture.frame_size;
 
-    sf::IntRect rect{{0,0},sprite_texture.frame_size};
-    fmt::println("ICON SIZE: {},{}; {},{}",
-        rect.position.x, rect.position.y,
-        rect.size.x, rect.size.y);
+    sf::IntRect rect{{0,0}, bounds};
     sprite = make_shared<sf::Sprite>(*sprite_texture.texture, rect);
 
     sprite->setPosition({ float(cell.x + padding), float(cell.y + padding)});
+
+    float a_ratio = float(bounds.x) / float(bounds.y);
+    float x_scale = float(cell.w - padding * 2) / float(bounds.x);
+    float y_new_size = (float(bounds.x) * x_scale) / a_ratio;
+    float y_scale = float(cell.h - padding * 2) / y_new_size;
+
+    sprite->setScale({x_scale, y_scale});
   }
 
   void Icon::render(sf::RenderWindow& window, sf::Shader *shader_ptr) {
     window.draw(*sprite, shader_ptr);
   }
 
-
   void Rectangle::init(lel::Cell& cell) {
     sf::Vector2f size{float(cell.w) - padding * 2, float(cell.h) - padding * 2};
     if(shape == nullptr) shape = make_shared<sf::RectangleShape>(size);

From a22342cd7ee96b0a6b6047e85c36e0f5d9338a45 Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Tue, 22 Jul 2025 16:22:05 -0400
Subject: [PATCH 02/13] Now Sprite can do either aspect_ratio scaling or
 stretching and Icon is just a subclass.

---
 demos/clicker_game.cpp            |  2 +-
 include/guecs/sfml/components.hpp | 11 ++------
 src/guecs/sfml/components.cpp     | 43 +++++++------------------------
 3 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/demos/clicker_game.cpp b/demos/clicker_game.cpp
index bb6cda7..d932de6 100644
--- a/demos/clicker_game.cpp
+++ b/demos/clicker_game.cpp
@@ -101,7 +101,7 @@ struct ClickerUI {
     }
 
     $clicker = $gui.entity("clicker");
-    $gui.set<guecs::Sprite>($clicker, {"clicker_the_dog"});
+    $gui.set<guecs::Sprite>($clicker, {"clicker_the_dog", 0, true});
     $gui.set<guecs::Sound>($clicker, {"clicker_bark"});
     $gui.set<guecs::Clickable>($clicker, {
         [&](auto, auto) { handle_button(Event::CLICKER); }
diff --git a/include/guecs/sfml/components.hpp b/include/guecs/sfml/components.hpp
index a323371..49ade35 100644
--- a/include/guecs/sfml/components.hpp
+++ b/include/guecs/sfml/components.hpp
@@ -40,6 +40,7 @@ namespace guecs {
   struct Sprite {
     string name;
     int padding = THEME.PADDING;
+    bool stretch = false;
     std::shared_ptr<sf::Sprite> sprite = nullptr;
 
     void init(lel::Cell &cell);
@@ -47,15 +48,7 @@ namespace guecs {
     void render(sf::RenderWindow& window, sf::Shader *shader_ptr);
   };
 
-  struct Icon {
-    string name;
-    int padding = THEME.PADDING;
-    std::shared_ptr<sf::Sprite> sprite = nullptr;
-
-    void init(lel::Cell &cell);
-    void update(const string& new_name);
-    void render(sf::RenderWindow& window, sf::Shader *shader_ptr);
-  };
+  struct Icon : public Sprite { };
 
   struct Rectangle {
     int padding = THEME.PADDING;
diff --git a/src/guecs/sfml/components.cpp b/src/guecs/sfml/components.cpp
index 52c86cd..329a069 100644
--- a/src/guecs/sfml/components.cpp
+++ b/src/guecs/sfml/components.cpp
@@ -52,42 +52,19 @@ namespace guecs {
 
     sprite->setPosition({float(cell.x + padding), float(cell.y + padding)});
 
-    sprite->setScale({
-        float(cell.w - padding * 2) / float(bounds.x),
-        float(cell.h - padding * 2) / float(bounds.y)});
-  }
-
-  void Sprite::render(sf::RenderWindow& window, sf::Shader *shader_ptr) {
-    window.draw(*sprite, shader_ptr);
-  }
-
-  void Icon::update(const string& new_name) {
-    if(new_name != name) {
-      name = new_name;
-      auto sprite_texture = BACKEND->get_icon(name);
-      sprite->setTexture(*sprite_texture.texture);
-      sprite->setTextureRect({{0,0},sprite_texture.frame_size});
+    if(stretch) {
+      sprite->setScale({
+          float(cell.w - padding * 2) / float(bounds.x),
+          float(cell.h - padding * 2) / float(bounds.y)});
+    } else {
+      float box_width = float(cell.w - padding * 2);
+      float box_height = float(cell.h - padding * 2);
+      float scale = std::min(box_width / float(bounds.x), box_height / float(bounds.y));
+      sprite->setScale({scale, scale});
     }
   }
 
-  void Icon::init(lel::Cell &cell) {
-    auto sprite_texture = BACKEND->get_icon(name);
-    auto bounds = sprite_texture.frame_size;
-
-    sf::IntRect rect{{0,0}, bounds};
-    sprite = make_shared<sf::Sprite>(*sprite_texture.texture, rect);
-
-    sprite->setPosition({ float(cell.x + padding), float(cell.y + padding)});
-
-    float a_ratio = float(bounds.x) / float(bounds.y);
-    float x_scale = float(cell.w - padding * 2) / float(bounds.x);
-    float y_new_size = (float(bounds.x) * x_scale) / a_ratio;
-    float y_scale = float(cell.h - padding * 2) / y_new_size;
-
-    sprite->setScale({x_scale, y_scale});
-  }
-
-  void Icon::render(sf::RenderWindow& window, sf::Shader *shader_ptr) {
+  void Sprite::render(sf::RenderWindow& window, sf::Shader *shader_ptr) {
     window.draw(*sprite, shader_ptr);
   }
 

From 3752522597999d08233f2c56292e954e42364aa3 Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Tue, 22 Jul 2025 17:11:02 -0400
Subject: [PATCH 03/13] Fixed Icon vs. Sprite and now Icon is just a subclass
 of Sprite. Closes #12.

---
 demos/clicker_game.cpp            |  4 ++--
 include/guecs/sfml/components.hpp | 17 +++++++++++++++--
 src/guecs/sfml/components.cpp     | 10 +++++++++-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/demos/clicker_game.cpp b/demos/clicker_game.cpp
index d932de6..6e271ec 100644
--- a/demos/clicker_game.cpp
+++ b/demos/clicker_game.cpp
@@ -93,7 +93,7 @@ struct ClickerUI {
       if(name != "clicker") {
         $gui.set<guecs::Rectangle>(id, {});
         $gui.set<guecs::Effect>(id, {});
-        $gui.set<guecs::Icon>(id, { "clicker_treat_bone" });
+        $gui.set<guecs::Sprite>(id, { "clicker_treat_bone" });
         $gui.set<guecs::Clickable>(id, {
             [&](auto, auto) { handle_button(Event::A_BUTTON); }
             });
@@ -101,7 +101,7 @@ struct ClickerUI {
     }
 
     $clicker = $gui.entity("clicker");
-    $gui.set<guecs::Sprite>($clicker, {"clicker_the_dog", 0, true});
+    $gui.set<guecs::Sprite>($clicker, {"clicker_the_dog"});
     $gui.set<guecs::Sound>($clicker, {"clicker_bark"});
     $gui.set<guecs::Clickable>($clicker, {
         [&](auto, auto) { handle_button(Event::CLICKER); }
diff --git a/include/guecs/sfml/components.hpp b/include/guecs/sfml/components.hpp
index 49ade35..c7d989f 100644
--- a/include/guecs/sfml/components.hpp
+++ b/include/guecs/sfml/components.hpp
@@ -40,7 +40,8 @@ namespace guecs {
   struct Sprite {
     string name;
     int padding = THEME.PADDING;
-    bool stretch = false;
+    bool stretch = true;
+    bool is_icon = false;
     std::shared_ptr<sf::Sprite> sprite = nullptr;
 
     void init(lel::Cell &cell);
@@ -48,7 +49,19 @@ namespace guecs {
     void render(sf::RenderWindow& window, sf::Shader *shader_ptr);
   };
 
-  struct Icon : public Sprite { };
+  struct Icon : public Sprite {
+    template<typename... Args>
+      Icon(Args... args) : Sprite(args...)
+    {
+      stretch = false;
+      is_icon = true;
+    }
+
+    Icon() {
+      // BUG: why do I have to do this again?
+      stretch = false;
+    };
+  };
 
   struct Rectangle {
     int padding = THEME.PADDING;
diff --git a/src/guecs/sfml/components.cpp b/src/guecs/sfml/components.cpp
index 329a069..db46ad6 100644
--- a/src/guecs/sfml/components.cpp
+++ b/src/guecs/sfml/components.cpp
@@ -43,8 +43,16 @@ namespace guecs {
     }
   }
 
+  inline SpriteTexture load_texture(const string& name, bool is_icon) {
+    if(is_icon) {
+      return BACKEND->get_icon(name);
+    } else {
+      return BACKEND->get_sprite(name);
+    }
+  }
+
   void Sprite::init(lel::Cell &cell) {
-    auto sprite_texture = BACKEND->get_sprite(name);
+    auto sprite_texture = load_texture(name, is_icon);
     auto bounds = sprite_texture.frame_size;
 
     sf::IntRect rect{{0,0}, bounds};

From 2c22da022f1eaf420af050b7ce6ca33e7d6021e6 Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Wed, 23 Jul 2025 00:25:00 -0400
Subject: [PATCH 04/13] Text can be centered wither with the centered attribute
 on a class or with = in the spec.

---
 demos/clicker_game.cpp        | 17 ++++++++---------
 src/guecs/sfml/components.cpp |  3 ++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/demos/clicker_game.cpp b/demos/clicker_game.cpp
index 6e271ec..7651ee1 100644
--- a/demos/clicker_game.cpp
+++ b/demos/clicker_game.cpp
@@ -73,7 +73,7 @@ struct ClickerUI {
   ClickerUI() {
     $gui.position(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT);
     $gui.layout(
-        "[_|*%(300,400)clicker|_|_|_]"
+        "[_|=*%(300,400)clicker|_|_|_]"
         "[_|_               |_|_|_]"
         "[_|_               |_|_|_]"
         "[_|_               |_|_|_]"
@@ -135,15 +135,14 @@ struct ClickerUI {
     using enum Event;
     switch(ev) {
       case CLICKER: {
-                      auto& shaker = $gui.get<Shake>($clicker);
-                      auto& sprite = $gui.get<guecs::Sprite>($clicker);
-                      shaker.play(sprite);
-                      fmt::println("CLICKER LOVES YOU!");
-                    } break;
+          auto& shaker = $gui.get<Shake>($clicker);
+          auto& sprite = $gui.get<guecs::Sprite>($clicker);
+          shaker.play(sprite);
+          fmt::println("CLICKER LOVES YOU!");
+        } break;
       case A_BUTTON:
-                    fmt::println("a button clicked");
-                    break;
-
+        fmt::println("a button clicked");
+        break;
       default:
                     assert(false && "invalid event");
     }
diff --git a/src/guecs/sfml/components.cpp b/src/guecs/sfml/components.cpp
index db46ad6..06c2f0f 100644
--- a/src/guecs/sfml/components.cpp
+++ b/src/guecs/sfml/components.cpp
@@ -13,7 +13,7 @@ namespace guecs {
     if(text == nullptr) text = make_shared<sf::Text>(*font, content, size);
     text->setFillColor(color);
 
-    if(centered) {
+    if(centered || cell.center) {
       auto bounds = text->getLocalBounds();
       auto text_cell = lel::center(bounds.size.x, bounds.size.y, cell);
       // this stupid / 2 is because SFML renders from baseline rather than from the claimed bounding box
@@ -57,6 +57,7 @@ namespace guecs {
 
     sf::IntRect rect{{0,0}, bounds};
     sprite = make_shared<sf::Sprite>(*sprite_texture.texture, rect);
+    fmt::println("SPRITE centered: {}", cell.center);
 
     sprite->setPosition({float(cell.x + padding), float(cell.y + padding)});
 

From 9e9b9620c9314b776b200e06995f80f77ed85ce9 Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Wed, 23 Jul 2025 12:48:29 -0400
Subject: [PATCH 05/13] Major refactoring but now centering text and sprites
 works. See Issue #16 for why only those and not anything else yet.

---
 demos/calc.cpp                    | 18 ++++++-------
 demos/clicker_game.cpp            |  6 ++---
 include/guecs/sfml/components.hpp | 29 +--------------------
 src/guecs/lel.cpp                 |  1 +
 src/guecs/sfml/components.cpp     | 43 ++++++++++++++++++++-----------
 src/guecs/ui.cpp                  | 42 ++++--------------------------
 6 files changed, 47 insertions(+), 92 deletions(-)

diff --git a/demos/calc.cpp b/demos/calc.cpp
index c8f69ab..c96ffea 100644
--- a/demos/calc.cpp
+++ b/demos/calc.cpp
@@ -141,12 +141,12 @@ struct CalculatorUI {
     $gui.layout(
         "[*%(400)stack  |_|_|_]"
         "[*%(400)readout|_|_|_]"
-        "[push|pop|clear|eq]"
-        "[add |sub|mul  |div]"
-        "[btn7|btn8|btn9]"
-        "[btn4|btn5|btn6]"
-        "[btn1|btn2|btn3]"
-        "[neg |btn0|del]");
+        "[=push|=pop|=clear|=eq]"
+        "[=add |=sub|=mul  |=div]"
+        "[=btn7|=btn8|=btn9]"
+        "[=btn4|=btn5|=btn6]"
+        "[=btn1|=btn2|=btn3]"
+        "[=neg |=btn0|=del]");
   }
 
   void init() {
@@ -161,12 +161,12 @@ struct CalculatorUI {
       $gui.set<guecs::Rectangle>(id, {});
 
       if(name == "readout") {
-        $gui.set<guecs::Textual>(id, {L"", 40});
+        $gui.set<guecs::Text>(id, {L"", 40});
       } else if(name == "stack") {
-        $gui.set<guecs::Textual>(id, {L"", 20});
+        $gui.set<guecs::Text>(id, {L"", 20});
       } else {
         $gui.set<guecs::Effect>(id, {});
-        $gui.set<guecs::Label>(id, { label });
+        $gui.set<guecs::Text>(id, { label });
         wchar_t op = label[0];
         $gui.set<guecs::Clickable>(id, {
             [&, op](auto, auto) { handle_button(op); }
diff --git a/demos/clicker_game.cpp b/demos/clicker_game.cpp
index 7651ee1..7f41742 100644
--- a/demos/clicker_game.cpp
+++ b/demos/clicker_game.cpp
@@ -77,7 +77,7 @@ struct ClickerUI {
         "[_|_               |_|_|_]"
         "[_|_               |_|_|_]"
         "[_|_               |_|_|_]"
-        "[a1|a2|a3|a4|a5]");
+        "[(30,30)a1|=(30,30)a2|a3|=a4|a5]");
   }
 
   void init() {
@@ -91,9 +91,9 @@ struct ClickerUI {
     for(auto& [name, cell] : $gui.cells()) {
       auto id = $gui.entity(name);
       if(name != "clicker") {
-        $gui.set<guecs::Rectangle>(id, {});
+        $gui.set<guecs::Rectangle>(id, {0, {255, 0, 0, 255}});
         $gui.set<guecs::Effect>(id, {});
-        $gui.set<guecs::Sprite>(id, { "clicker_treat_bone" });
+        // $gui.set<guecs::Sprite>(id, { "clicker_treat_bone" });
         $gui.set<guecs::Clickable>(id, {
             [&](auto, auto) { handle_button(Event::A_BUTTON); }
             });
diff --git a/include/guecs/sfml/components.hpp b/include/guecs/sfml/components.hpp
index c7d989f..dc82033 100644
--- a/include/guecs/sfml/components.hpp
+++ b/include/guecs/sfml/components.hpp
@@ -10,7 +10,7 @@
 namespace guecs {
   using std::shared_ptr, std::wstring, std::string;
 
-  struct Textual {
+  struct Text {
     std::wstring content;
     unsigned int size = THEME.TEXT_SIZE;
     sf::Color color = THEME.TEXT_COLOR;
@@ -24,19 +24,6 @@ namespace guecs {
     void render(sf::RenderWindow& window, sf::Shader *shader_ptr);
   };
 
-  struct Label : public Textual {
-    template<typename... Args>
-      Label(Args... args) : Textual(args...)
-    {
-      centered = true;
-      size = THEME.LABEL_SIZE;
-    }
-
-    Label() {
-      centered = true;
-    };
-  };
-
   struct Sprite {
     string name;
     int padding = THEME.PADDING;
@@ -49,20 +36,6 @@ namespace guecs {
     void render(sf::RenderWindow& window, sf::Shader *shader_ptr);
   };
 
-  struct Icon : public Sprite {
-    template<typename... Args>
-      Icon(Args... args) : Sprite(args...)
-    {
-      stretch = false;
-      is_icon = true;
-    }
-
-    Icon() {
-      // BUG: why do I have to do this again?
-      stretch = false;
-    };
-  };
-
   struct Rectangle {
     int padding = THEME.PADDING;
     sf::Color color = THEME.FILL_COLOR;
diff --git a/src/guecs/lel.cpp b/src/guecs/lel.cpp
index b363293..c8efccc 100644
--- a/src/guecs/lel.cpp
+++ b/src/guecs/lel.cpp
@@ -50,6 +50,7 @@ namespace lel {
     int cell_height = grid_h / rows;
 
     for(auto& row : grid) {
+      // BUG: see issue #16
       size_t columns = row.size();
       int cell_width = grid_w / columns;
       assert(cell_width > 0 && "invalid cell width calc");
diff --git a/src/guecs/sfml/components.cpp b/src/guecs/sfml/components.cpp
index 06c2f0f..6dbb221 100644
--- a/src/guecs/sfml/components.cpp
+++ b/src/guecs/sfml/components.cpp
@@ -7,7 +7,28 @@
 namespace guecs {
   using std::make_shared;
 
-  void Textual::init(lel::Cell &cell, shared_ptr<sf::Font> font_ptr) {
+  template<typename T>
+    void sfml_center_helper(T& obj, lel::Cell& cell, int padding) {
+      sf::Vector2f position{float(cell.x + padding), float(cell.y + padding)};
+
+      if(cell.center) {
+        auto bounds = obj->getLocalBounds();
+        position = {float(cell.mid_x), float(cell.mid_y)};
+        obj->setOrigin({bounds.size.x/2, bounds.size.y/2});
+      }
+
+      obj->setPosition(position);
+    }
+
+  inline SpriteTexture load_texture(const string& name, bool is_icon) {
+    if(is_icon) {
+      return BACKEND->get_icon(name);
+    } else {
+      return BACKEND->get_sprite(name);
+    }
+  }
+
+  void Text::init(lel::Cell &cell, shared_ptr<sf::Font> font_ptr) {
     assert(font_ptr != nullptr && "you failed to initialize this WideText");
     if(font == nullptr) font = font_ptr;
     if(text == nullptr) text = make_shared<sf::Text>(*font, content, size);
@@ -25,11 +46,11 @@ namespace guecs {
     text->setCharacterSize(size);
   }
 
-  void Textual::render(sf::RenderWindow& window, sf::Shader *shader_ptr) {
+  void Text::render(sf::RenderWindow& window, sf::Shader *shader_ptr) {
     window.draw(*text, shader_ptr);
   }
 
-  void Textual::update(const wstring& new_content) {
+  void Text::update(const wstring& new_content) {
     content = new_content;
     text->setString(content);
   }
@@ -43,23 +64,14 @@ namespace guecs {
     }
   }
 
-  inline SpriteTexture load_texture(const string& name, bool is_icon) {
-    if(is_icon) {
-      return BACKEND->get_icon(name);
-    } else {
-      return BACKEND->get_sprite(name);
-    }
-  }
-
   void Sprite::init(lel::Cell &cell) {
+    if(cell.center) stretch = false;
+
     auto sprite_texture = load_texture(name, is_icon);
     auto bounds = sprite_texture.frame_size;
 
     sf::IntRect rect{{0,0}, bounds};
     sprite = make_shared<sf::Sprite>(*sprite_texture.texture, rect);
-    fmt::println("SPRITE centered: {}", cell.center);
-
-    sprite->setPosition({float(cell.x + padding), float(cell.y + padding)});
 
     if(stretch) {
       sprite->setScale({
@@ -71,6 +83,8 @@ namespace guecs {
       float scale = std::min(box_width / float(bounds.x), box_height / float(bounds.y));
       sprite->setScale({scale, scale});
     }
+
+    sfml_center_helper(sprite, cell, padding);
   }
 
   void Sprite::render(sf::RenderWindow& window, sf::Shader *shader_ptr) {
@@ -80,7 +94,6 @@ namespace guecs {
   void Rectangle::init(lel::Cell& cell) {
     sf::Vector2f size{float(cell.w) - padding * 2, float(cell.h) - padding * 2};
     if(shape == nullptr) shape = make_shared<sf::RectangleShape>(size);
-    shape->setPosition({float(cell.x + padding), float(cell.y + padding)});
     shape->setFillColor(color);
     shape->setOutlineColor(border_color);
     shape->setOutlineThickness(border_px);
diff --git a/src/guecs/ui.cpp b/src/guecs/ui.cpp
index b1824c6..5e8d498 100644
--- a/src/guecs/ui.cpp
+++ b/src/guecs/ui.cpp
@@ -82,21 +82,13 @@ namespace guecs {
       }
     });
 
-    query<lel::Cell, Textual>([this](auto, auto& cell, auto& text) {
-      text.init(cell, $font);
-    });
-
-    query<lel::Cell, Label>([this](auto, auto& cell, auto& text) {
+    query<lel::Cell, Text>([this](auto, auto& cell, auto& text) {
       text.init(cell, $font);
     });
 
     query<lel::Cell, Sprite>([&](auto, auto &cell, auto &sprite) {
       sprite.init(cell);
     });
-
-    query<lel::Cell, Icon>([&](auto, auto &cell, auto &icon) {
-      icon.init(cell);
-    });
   }
 
   void UI::debug_layout(sf::RenderWindow& window) {
@@ -142,17 +134,7 @@ namespace guecs {
       sprite.render(window, shader_ptr);
     });
 
-    query<Icon>([&](auto ent, auto& icon) {
-      auto shader_ptr = find_shader(ent, false);
-      icon.render(window, shader_ptr);
-    });
-
-    query<Label>([&](auto ent, auto& text) {
-      auto shader_ptr = find_shader(ent, false);
-      text.render(window, shader_ptr);
-    });
-
-    query<Textual>([&](auto ent, auto& text) {
+    query<Text>([&](auto ent, auto& text) {
       auto shader_ptr = find_shader(ent, false);
       text.render(window, shader_ptr);
     });
@@ -209,13 +191,13 @@ namespace guecs {
   void UI::show_text(const string& region, const wstring& content) {
     auto ent = entity(region);
 
-    if(auto tc = get_if<Textual>(ent)) {
+    if(auto tc = get_if<Text>(ent)) {
       tc->text->setString(content);
     } else {
       auto &cell = cell_for(ent);
-      Textual to_set{content, THEME.TEXT_SIZE};
+      Text to_set{content, THEME.TEXT_SIZE};
       to_set.init(cell, $font);
-      set<Textual>(ent, to_set);
+      set<Text>(ent, to_set);
     }
   }
 
@@ -240,20 +222,6 @@ namespace guecs {
     }
   }
 
-  void UI::show_label(const string& region, const wstring& content) {
-    auto ent = entity(region);
-
-    if(auto tc = get_if<Label>(ent)) {
-      tc->text->setString(content);
-    } else {
-      auto &cell = cell_for(ent);
-      Label to_set{content, THEME.LABEL_SIZE};
-      to_set.init(cell, $font);
-      to_set.text->setFillColor(THEME.TEXT_COLOR);
-      set<Label>(ent, to_set);
-    }
-  }
-
   wstring to_wstring(const string& str) {
     std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> $converter;
     return $converter.from_bytes(str);

From 6837192583fed12f8fd3818054ef86863e4d21de Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Wed, 23 Jul 2025 12:48:56 -0400
Subject: [PATCH 06/13] Version bump.

---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 830a626..a9f4b00 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@
 # HEY BUG: when you have a . spec in a LEL it doesn't work on text
 
 project('lel-guecs', 'cpp',
-  version: '0.4.0',
+  version: '0.5.0',
   default_options: [
     'cpp_std=c++20',
     'cpp_args=-D_GLIBCXX_DEBUG=1 -D_GLIBCXX_DEBUG_PEDANTIC=1',

From 0d91c554c63648c620a3233d9bd968e210c860cd Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Wed, 23 Jul 2025 12:51:51 -0400
Subject: [PATCH 07/13] Fix the clicker demo.

---
 demos/clicker_game.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/demos/clicker_game.cpp b/demos/clicker_game.cpp
index 7f41742..17ffbb1 100644
--- a/demos/clicker_game.cpp
+++ b/demos/clicker_game.cpp
@@ -77,7 +77,7 @@ struct ClickerUI {
         "[_|_               |_|_|_]"
         "[_|_               |_|_|_]"
         "[_|_               |_|_|_]"
-        "[(30,30)a1|=(30,30)a2|a3|=a4|a5]");
+        "[a1|a2|a3|a4|a5]");
   }
 
   void init() {
@@ -91,9 +91,8 @@ struct ClickerUI {
     for(auto& [name, cell] : $gui.cells()) {
       auto id = $gui.entity(name);
       if(name != "clicker") {
-        $gui.set<guecs::Rectangle>(id, {0, {255, 0, 0, 255}});
         $gui.set<guecs::Effect>(id, {});
-        // $gui.set<guecs::Sprite>(id, { "clicker_treat_bone" });
+        $gui.set<guecs::Sprite>(id, { "clicker_treat_bone" });
         $gui.set<guecs::Clickable>(id, {
             [&](auto, auto) { handle_button(Event::A_BUTTON); }
             });

From 7e64879f7875d4496708a4124f2d093c06c8a9b1 Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Wed, 23 Jul 2025 13:30:42 -0400
Subject: [PATCH 08/13] Forgot to set the position on rectangle so just added
 the center helper.

---
 src/guecs/sfml/components.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/guecs/sfml/components.cpp b/src/guecs/sfml/components.cpp
index 6dbb221..e52097f 100644
--- a/src/guecs/sfml/components.cpp
+++ b/src/guecs/sfml/components.cpp
@@ -97,6 +97,8 @@ namespace guecs {
     shape->setFillColor(color);
     shape->setOutlineColor(border_color);
     shape->setOutlineThickness(border_px);
+
+    sfml_center_helper(shape, cell, padding);
   }
 
   void Rectangle::render(sf::RenderWindow& window, sf::Shader *shader_ptr) {

From 4c019048d0c5232d23b174873acbba833512cf82 Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Wed, 23 Jul 2025 13:49:16 -0400
Subject: [PATCH 09/13] Making Icons a thing again since it's convenient.

---
 demos/clicker_game.cpp            |  2 +-
 include/guecs/sfml/components.hpp | 14 ++++++++++++++
 include/guecs/ui.hpp              |  1 +
 src/guecs/ui.cpp                  | 19 +++++++++++++++++++
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/demos/clicker_game.cpp b/demos/clicker_game.cpp
index 17ffbb1..c76080a 100644
--- a/demos/clicker_game.cpp
+++ b/demos/clicker_game.cpp
@@ -92,7 +92,7 @@ struct ClickerUI {
       auto id = $gui.entity(name);
       if(name != "clicker") {
         $gui.set<guecs::Effect>(id, {});
-        $gui.set<guecs::Sprite>(id, { "clicker_treat_bone" });
+        $gui.set<guecs::Icon>(id, { "clicker_treat_bone" });
         $gui.set<guecs::Clickable>(id, {
             [&](auto, auto) { handle_button(Event::A_BUTTON); }
             });
diff --git a/include/guecs/sfml/components.hpp b/include/guecs/sfml/components.hpp
index dc82033..74d12bc 100644
--- a/include/guecs/sfml/components.hpp
+++ b/include/guecs/sfml/components.hpp
@@ -36,6 +36,20 @@ namespace guecs {
     void render(sf::RenderWindow& window, sf::Shader *shader_ptr);
   };
 
+  struct Icon : public Sprite {
+    template<typename... Args>
+      Icon(Args... args) : Sprite(args...)
+    {
+      stretch = false;
+      is_icon = true;
+    }
+
+    Icon() {
+      stretch = false;
+      is_icon = true;
+    };
+  };
+
   struct Rectangle {
     int padding = THEME.PADDING;
     sf::Color color = THEME.FILL_COLOR;
diff --git a/include/guecs/ui.hpp b/include/guecs/ui.hpp
index d66b063..1b309b5 100644
--- a/include/guecs/ui.hpp
+++ b/include/guecs/ui.hpp
@@ -218,6 +218,7 @@ namespace guecs {
       sf::Shader* find_shader(Entity ent, bool is_shape);
 
       void show_sprite(const string& region, const string& sprite_name);
+      void show_icon(const string& region, const string& sprite_name);
       void show_text(const string& region, const wstring& content);
       void show_label(const string& region, const wstring& content);
   };
diff --git a/src/guecs/ui.cpp b/src/guecs/ui.cpp
index 5e8d498..396a277 100644
--- a/src/guecs/ui.cpp
+++ b/src/guecs/ui.cpp
@@ -89,6 +89,10 @@ namespace guecs {
     query<lel::Cell, Sprite>([&](auto, auto &cell, auto &sprite) {
       sprite.init(cell);
     });
+
+    query<lel::Cell, Icon>([&](auto, auto &cell, auto &icon) {
+      icon.init(cell);
+    });
   }
 
   void UI::debug_layout(sf::RenderWindow& window) {
@@ -134,6 +138,11 @@ namespace guecs {
       sprite.render(window, shader_ptr);
     });
 
+    query<Icon>([&](auto ent, auto& icon) {
+      auto shader_ptr = find_shader(ent, false);
+      icon.render(window, shader_ptr);
+    });
+
     query<Text>([&](auto ent, auto& text) {
       auto shader_ptr = find_shader(ent, false);
       text.render(window, shader_ptr);
@@ -188,6 +197,16 @@ namespace guecs {
     }
   }
 
+  void UI::show_icon(const string& region, const string& sprite_name) {
+    auto ent = entity(region);
+
+    if(auto sprite = get_if<Icon>(ent)) {
+      sprite->update(sprite_name);
+    } else {
+      set_init<Icon>(ent, {sprite_name});
+    }
+  }
+
   void UI::show_text(const string& region, const wstring& content) {
     auto ent = entity(region);
 

From 5d0d8b16fc0716bdf96a96238c98a18559e97696 Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Thu, 14 Aug 2025 12:35:25 -0400
Subject: [PATCH 10/13] Removed hover on guecs::UI::mouse and now use a generic
 16 bit modifier bitset. Also finally fixed Clickable so it just a simple
 callback with only the modifiers.

---
 demos/calc.cpp         |  8 ++++----
 demos/clicker_game.cpp |  8 ++++----
 include/guecs/ui.hpp   | 21 ++++++++++++---------
 meson.build            |  2 +-
 src/guecs/ui.cpp       | 31 ++++++++-----------------------
 5 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/demos/calc.cpp b/demos/calc.cpp
index c96ffea..8f38517 100644
--- a/demos/calc.cpp
+++ b/demos/calc.cpp
@@ -169,8 +169,8 @@ struct CalculatorUI {
         $gui.set<guecs::Text>(id, { label });
         wchar_t op = label[0];
         $gui.set<guecs::Clickable>(id, {
-            [&, op](auto, auto) { handle_button(op); }
-            });
+            [&, op](auto) { handle_button(op); }
+        });
       }
     }
 
@@ -182,8 +182,8 @@ struct CalculatorUI {
     // $gui.debug_layout(window);
   }
 
-  void mouse(float x, float y, bool hover) {
-    $gui.mouse(x, y, hover);
+  void mouse(float x, float y, guecs::Modifiers mods) {
+    $gui.mouse(x, y, mods);
   }
 
   void handle_button(wchar_t op) {
diff --git a/demos/clicker_game.cpp b/demos/clicker_game.cpp
index c76080a..c5e68b6 100644
--- a/demos/clicker_game.cpp
+++ b/demos/clicker_game.cpp
@@ -94,7 +94,7 @@ struct ClickerUI {
         $gui.set<guecs::Effect>(id, {});
         $gui.set<guecs::Icon>(id, { "clicker_treat_bone" });
         $gui.set<guecs::Clickable>(id, {
-            [&](auto, auto) { handle_button(Event::A_BUTTON); }
+            [&](auto) { handle_button(Event::A_BUTTON); }
             });
       }
     }
@@ -103,7 +103,7 @@ struct ClickerUI {
     $gui.set<guecs::Sprite>($clicker, {"clicker_the_dog"});
     $gui.set<guecs::Sound>($clicker, {"clicker_bark"});
     $gui.set<guecs::Clickable>($clicker, {
-        [&](auto, auto) { handle_button(Event::CLICKER); }
+        [&](auto) { handle_button(Event::CLICKER); }
         });
 
     // custom components need to be initialized manually
@@ -126,8 +126,8 @@ struct ClickerUI {
     // $gui.debug_layout(window);
   }
 
-  void mouse(float x, float y, bool hover) {
-    $gui.mouse(x, y, hover);
+  void mouse(float x, float y, guecs::Modifiers mods) {
+    $gui.mouse(x, y, mods);
   }
 
   void handle_button(Event ev) {
diff --git a/include/guecs/ui.hpp b/include/guecs/ui.hpp
index 1b309b5..2d30731 100644
--- a/include/guecs/ui.hpp
+++ b/include/guecs/ui.hpp
@@ -10,6 +10,7 @@
 #include "guecs/theme.hpp"
 #include "guecs/sfml/components.hpp"
 #include <cassert>
+#include <bitset>
 
 namespace guecs {
   using std::shared_ptr, std::wstring, std::string;
@@ -24,22 +25,25 @@ namespace guecs {
       std::queue<size_t> free_indices;
     };
 
+  enum class ModBit {
+    hover=0,
+    left=1,
+    right=2
+  };
+
+  using Modifiers = std::bitset<16>;
+
   struct Clickable {
     /* This is actually called by UI::mouse and passed the entity ID of the
      * button pressed so you can interact with it in the event handler.
      */
-    std::function<void(Entity ent, std::any data)> action;
-  };
-
-  struct ActionData {
-    std::any data;
+    std::function<void(Modifiers mods)> action;
   };
 
   struct CellName {
     string name;
   };
 
-
   class UI {
     public:
       Entity MAIN = 0;
@@ -69,9 +73,8 @@ namespace guecs {
 
       void init();
       void render(sf::RenderWindow& window);
-      bool mouse(float x, float y, bool hover);
-      void click_on(const string& name, bool required=false);
-      void click_on(Entity slot_id);
+      bool mouse(float x, float y, Modifiers mods);
+      void click_on(Entity slot_id, Modifiers mods);
       void debug_layout(sf::RenderWindow& window);
 
       Entity entity() { return ++entity_count; }
diff --git a/meson.build b/meson.build
index a9f4b00..57f07ec 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@
 # HEY BUG: when you have a . spec in a LEL it doesn't work on text
 
 project('lel-guecs', 'cpp',
-  version: '0.5.0',
+  version: '0.6.0',
   default_options: [
     'cpp_std=c++20',
     'cpp_args=-D_GLIBCXX_DEBUG=1 -D_GLIBCXX_DEBUG_PEDANTIC=1',
diff --git a/src/guecs/ui.cpp b/src/guecs/ui.cpp
index 396a277..2d6c4d3 100644
--- a/src/guecs/ui.cpp
+++ b/src/guecs/ui.cpp
@@ -149,9 +149,9 @@ namespace guecs {
     });
   }
 
-  bool UI::mouse(float x, float y, bool hover) {
+  bool UI::mouse(float x, float y, Modifiers mods) {
     int action_count = 0;
-    // BUG: Is Parser::hit useful?
+    bool hover = mods.test(size_t(ModBit::hover));
 
     query<lel::Cell>([&](auto ent, auto& cell) {
       if((x >= cell.x && x <= cell.x + cell.w) &&
@@ -169,11 +169,11 @@ namespace guecs {
 
         if(hover) return;
 
-        click_on(ent);
+        click_on(ent, mods);
 
         action_count++;
       } else {
-        do_if<Effect>(ent, [hover](auto& effect) {
+        do_if<Effect>(ent, [](auto& effect) {
           effect.stop();
         });
 
@@ -220,25 +220,10 @@ namespace guecs {
     }
   }
 
-  void UI::click_on(const string& name, bool required) {
-    auto ent = entity(name);
-
-    if(required) {
-      assert(has<Clickable>(ent) &&
-          "click_on required '{}' to exist but it doesn't");
-    }
-
-    click_on(ent);
-  }
-
-  void UI::click_on(Entity ent) {
-    if(auto clicked = get_if<Clickable>(ent)) {
-      if(auto action_data = get_if<ActionData>(ent)) {
-        clicked->action(ent, action_data->data);
-      } else {
-        clicked->action(ent, {});
-      }
-    }
+  void UI::click_on(Entity gui_id, Modifiers mods) {
+    if(auto to_click = get_if<Clickable>(gui_id)) {
+      to_click->action(mods);
+    };
   }
 
   wstring to_wstring(const string& str) {

From 4b4992185fa2c27d5d93898001c35c08c057c0ea Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Thu, 14 Aug 2025 12:54:16 -0400
Subject: [PATCH 11/13] Needed a default of no Modifiers to click_on since
 that's a very common operation. Also a constant to represent that.

---
 include/guecs/ui.hpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/guecs/ui.hpp b/include/guecs/ui.hpp
index 2d30731..af61965 100644
--- a/include/guecs/ui.hpp
+++ b/include/guecs/ui.hpp
@@ -26,13 +26,16 @@ namespace guecs {
     };
 
   enum class ModBit {
-    hover=0,
-    left=1,
-    right=2
+    NONE=0,
+    hover=1,
+    left=2,
+    right=3
   };
 
   using Modifiers = std::bitset<16>;
 
+  constexpr const Modifiers NO_MODS{size_t(ModBit::NONE)};
+
   struct Clickable {
     /* This is actually called by UI::mouse and passed the entity ID of the
      * button pressed so you can interact with it in the event handler.
@@ -74,7 +77,7 @@ namespace guecs {
       void init();
       void render(sf::RenderWindow& window);
       bool mouse(float x, float y, Modifiers mods);
-      void click_on(Entity slot_id, Modifiers mods);
+      void click_on(Entity slot_id, Modifiers mods=NO_MODS);
       void debug_layout(sf::RenderWindow& window);
 
       Entity entity() { return ++entity_count; }

From 41d568ab256e34e4dabeac2518970f78639e4fdf Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Thu, 14 Aug 2025 13:01:27 -0400
Subject: [PATCH 12/13] Bring back the convenience method to click on a cell by
 name.

---
 include/guecs/ui.hpp | 1 +
 src/guecs/ui.cpp     | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/include/guecs/ui.hpp b/include/guecs/ui.hpp
index af61965..faf8327 100644
--- a/include/guecs/ui.hpp
+++ b/include/guecs/ui.hpp
@@ -77,6 +77,7 @@ namespace guecs {
       void init();
       void render(sf::RenderWindow& window);
       bool mouse(float x, float y, Modifiers mods);
+      void click_on(const std::string& name, Modifiers mods=NO_MODS);
       void click_on(Entity slot_id, Modifiers mods=NO_MODS);
       void debug_layout(sf::RenderWindow& window);
 
diff --git a/src/guecs/ui.cpp b/src/guecs/ui.cpp
index 2d6c4d3..1cbaffd 100644
--- a/src/guecs/ui.cpp
+++ b/src/guecs/ui.cpp
@@ -220,6 +220,10 @@ namespace guecs {
     }
   }
 
+  void UI::click_on(const std::string& name, Modifiers mods) {
+    click_on(entity(name), mods);
+  }
+
   void UI::click_on(Entity gui_id, Modifiers mods) {
     if(auto to_click = get_if<Clickable>(gui_id)) {
       to_click->action(mods);

From 070244269e44cdf4591af410e9d5e831575c6d86 Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Thu, 14 Aug 2025 13:59:36 -0400
Subject: [PATCH 13/13] class enums are just jank when trying to work with a
 bitset.

---
 include/guecs/ui.hpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/guecs/ui.hpp b/include/guecs/ui.hpp
index faf8327..bb1f7b7 100644
--- a/include/guecs/ui.hpp
+++ b/include/guecs/ui.hpp
@@ -25,16 +25,18 @@ namespace guecs {
       std::queue<size_t> free_indices;
     };
 
-  enum class ModBit {
-    NONE=0,
-    hover=1,
-    left=2,
-    right=3
-  };
+  namespace ModBit {
+    enum {
+      NONE=0,
+      hover=1,
+      left=2,
+      right=3
+    };
+  }
 
   using Modifiers = std::bitset<16>;
 
-  constexpr const Modifiers NO_MODS{size_t(ModBit::NONE)};
+  constexpr const Modifiers NO_MODS{0};
 
   struct Clickable {
     /* This is actually called by UI::mouse and passed the entity ID of the