From c34b9191f258ddc15c5b45c000cd0266aed9dead Mon Sep 17 00:00:00 2001
From: Benji Dial <benji@benjidial.net>
Date: Mon, 29 Jul 2024 21:26:17 -0400
Subject: window borders

---
 libraries/pake/include/pake/widget.hpp             |  8 +++++
 libraries/pake/include/pake/widgets/fixed-text.hpp |  5 ++-
 libraries/pake/source/widgets/fixed-text.cpp       | 42 +++++++++++++++++-----
 3 files changed, 45 insertions(+), 10 deletions(-)

(limited to 'libraries/pake')

diff --git a/libraries/pake/include/pake/widget.hpp b/libraries/pake/include/pake/widget.hpp
index dad5651..466fb80 100644
--- a/libraries/pake/include/pake/widget.hpp
+++ b/libraries/pake/include/pake/widget.hpp
@@ -4,6 +4,14 @@
 
 namespace pake {
 
+  enum class halign {
+    left, center, right
+  };
+
+  enum class valign {
+    top, center, bottom
+  };
+
   class widget {
 
   public:
diff --git a/libraries/pake/include/pake/widgets/fixed-text.hpp b/libraries/pake/include/pake/widgets/fixed-text.hpp
index c6dafab..dc2e277 100644
--- a/libraries/pake/include/pake/widgets/fixed-text.hpp
+++ b/libraries/pake/include/pake/widgets/fixed-text.hpp
@@ -12,6 +12,8 @@ namespace pake::widgets {
     std::string text;
 
     int width, height;
+    halign ha;
+    valign va;
 
   public:
     //TODO: look up font in some kind of catalogue
@@ -19,7 +21,8 @@ namespace pake::widgets {
       std::string &&text,
       const daguerre::fixed_font<bool> *font,
       daguerre::hilbert_color bg,
-      daguerre::hilbert_color fg);
+      daguerre::hilbert_color fg,
+      halign ha, valign va);
 
     virtual void render(
       dirtiable_image &onto, int x_off, int y_off, bool force) override;
diff --git a/libraries/pake/source/widgets/fixed-text.cpp b/libraries/pake/source/widgets/fixed-text.cpp
index 9ae55dc..c3a9a10 100644
--- a/libraries/pake/source/widgets/fixed-text.cpp
+++ b/libraries/pake/source/widgets/fixed-text.cpp
@@ -12,24 +12,48 @@ namespace pake::widgets {
     std::string &&text,
     const daguerre::fixed_font<bool> *font,
     daguerre::hilbert_color bg,
-    daguerre::hilbert_color fg)
-  : font(font), bg(bg), fg(fg), text(std::move(text)) {}
+    daguerre::hilbert_color fg,
+    halign ha, valign va)
+  : font(font), bg(bg), fg(fg),
+    text(std::move(text)), ha(ha), va(va) {}
 
   void fixed_text::render(
     dirtiable_image &onto, int x_off, int y_off, bool force) {
 
     if (force) {
-      onto.image.fill(  bg, x_off, y_off, width, height);
-      onto.dirty.fill(true, x_off, y_off, width, height);
-      //TODO: have options for alignment
+
       //TODO: check overflow
+
+      onto.dirty.fill(true, x_off, y_off, width, height);
+
+      onto.image.fill(  bg, x_off, y_off, width, height);
+
+      switch (ha) {
+      case halign::left:
+        break;
+      case halign::center:
+        x_off = width / 2 - text.size() * font->glyph_width / 2;
+        break;
+      case halign::right:
+        x_off = width - text.size() * font->glyph_width;
+        break;
+      }
+
+      switch (va) {
+      case valign::top:
+        break;
+      case valign::center:
+        y_off = height / 2 - font->glyph_height / 2;
+        break;
+      case valign::bottom:
+        y_off = height - font->glyph_width;
+        break;
+      }
+
       onto.image.render_text(
         *font, fg, x_off, y_off,
         text.data(), draw_if_true);
-      onto.dirty.fill(
-        true, x_off, y_off,
-        font->glyph_width * text.size(),
-        font->glyph_height);
+
     }
 
   }
-- 
cgit v1.2.3