From e3d3ba2c86c6a3f62db4094d4d992efb9083f1f9 Mon Sep 17 00:00:00 2001
From: Magnus Norddahl <dpjudas@users.noreply.github.com>
Date: Sun, 7 Jan 2024 11:48:17 +0100
Subject: [PATCH] Sync zwidget upstream changes

---
 libraries/ZWidget/src/core/truetypefont.h           | 1 +
 libraries/ZWidget/src/widgets/lineedit/lineedit.cpp | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libraries/ZWidget/src/core/truetypefont.h b/libraries/ZWidget/src/core/truetypefont.h
index dabc1bf59a..6dbe4050e9 100644
--- a/libraries/ZWidget/src/core/truetypefont.h
+++ b/libraries/ZWidget/src/core/truetypefont.h
@@ -5,6 +5,7 @@
 #include <vector>
 #include <stdexcept>
 #include <memory>
+#include <cstring>
 
 typedef uint8_t ttf_uint8;
 typedef uint16_t ttf_uint16;
diff --git a/libraries/ZWidget/src/widgets/lineedit/lineedit.cpp b/libraries/ZWidget/src/widgets/lineedit/lineedit.cpp
index bab04c3fb1..8a7af4ec42 100644
--- a/libraries/ZWidget/src/widgets/lineedit/lineedit.cpp
+++ b/libraries/ZWidget/src/widgets/lineedit/lineedit.cpp
@@ -123,11 +123,11 @@ void LineEdit::SetReadOnly(bool enable)
 	}
 }
 
-void LineEdit::SetAlignment(Alignment alignment)
+void LineEdit::SetAlignment(Alignment newalignment)
 {
-	if (alignment != alignment)
+	if (alignment != newalignment)
 	{
-		alignment = alignment;
+		alignment = newalignment;
 		Update();
 	}
 }