From fc2a7ce42f255fac6d03827f9b0b80bd357eac4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Z=C3=ADpek?= <jan@zipek.cz>
Date: Sun, 30 Jun 2024 10:21:28 +0200
Subject: [PATCH] Improve text alignment

---
 dow.code-workspace |  9 ++++++++-
 firmware/dow.cpp   | 27 +++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/dow.code-workspace b/dow.code-workspace
index 5161195..6ffbb6d 100644
--- a/dow.code-workspace
+++ b/dow.code-workspace
@@ -7,5 +7,12 @@
 			"path": "firmware"
 		}
 	],
-	"settings": {}
+	"settings": {
+		"files.associations": {
+			"*.ejs": "html",
+			".env": "env",
+			".env.*": "env",
+			"cmath": "cpp"
+		}
+	}
 }
\ No newline at end of file
diff --git a/firmware/dow.cpp b/firmware/dow.cpp
index dd33c61..8c4fa89 100644
--- a/firmware/dow.cpp
+++ b/firmware/dow.cpp
@@ -26,6 +26,8 @@ void dow_get_text_item_rect(GxEPD2_BW<GxEPD2_583_GDEQ0583T31, GxEPD2_583_GDEQ058
   dow_apply_font(display, item->font);
   display.getTextBounds(item->contents, 0, 0, &tbx, &tby, &tbw, &tbh);
 
+  // bool debug = item->contents.equals("Srazky");
+
   int x = item->x;
   int y = item->y;
   int w = tbw;
@@ -50,14 +52,14 @@ void dow_get_text_item_rect(GxEPD2_BW<GxEPD2_583_GDEQ0583T31, GxEPD2_583_GDEQ058
   {
   case ITEM_ALIGN_CENTER:
   {
-    y += tby;
+    y -= (h + tby);
     y += round((double)h / 2);
     break;
   }
 
   case ITEM_ALIGN_START:
   {
-    y += tby;
+    y -= (h + tby);
     y += h;
     break;
   }
@@ -79,6 +81,27 @@ void dow_get_text_item_rect(GxEPD2_BW<GxEPD2_583_GDEQ0583T31, GxEPD2_583_GDEQ058
   *ry = y;
   *rw = w;
   *rh = h;
+
+  /*
+  if (debug)
+  {
+    Serial.print(x);
+    Serial.print(", ");
+    Serial.print(y);
+    Serial.print(", ");
+    Serial.print(w);
+    Serial.print(", ");
+    Serial.print(h);
+    Serial.print(", tbx:");
+    Serial.print(tbx);
+    Serial.print(", tby:");
+    Serial.print(tby);
+    Serial.print(", tbw:");
+    Serial.print(tbw);
+    Serial.print(", tbh:");
+    Serial.println(tbh);
+  }
+  */
 }
 
 void dow_get_item_rect(GxEPD2_BW<GxEPD2_583_GDEQ0583T31, GxEPD2_583_GDEQ0583T31::HEIGHT> &display, dow_item_t *item, int *rx, int *ry, int *rw, int *rh)