From b2ba110df96266cf4e061d114404a551580ba66c Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sun, 7 Jan 2024 11:48:17 +0100 Subject: [PATCH] Sync zwidget upstream changes --- libraries/ZWidget/src/core/schrift/schrift.cpp | 2 +- libraries/ZWidget/src/core/truetypefont.h | 1 + libraries/ZWidget/src/widgets/imagebox/imagebox.cpp | 1 - libraries/ZWidget/src/widgets/lineedit/lineedit.cpp | 6 +++--- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/ZWidget/src/core/schrift/schrift.cpp b/libraries/ZWidget/src/core/schrift/schrift.cpp index 0febb86c0..3b2594135 100644 --- a/libraries/ZWidget/src/core/schrift/schrift.cpp +++ b/libraries/ZWidget/src/core/schrift/schrift.cpp @@ -1548,7 +1548,7 @@ render_outline(Outline *outl, double transform[6], SFT_Image image) numPixels = (unsigned int) image.width * (unsigned int) image.height; - STACK_ALLOC(cells, Cell, 128 * 128, numPixels); + STACK_ALLOC(cells, Cell, 32 * 32, numPixels); if (!cells) { return -1; } diff --git a/libraries/ZWidget/src/core/truetypefont.h b/libraries/ZWidget/src/core/truetypefont.h index dabc1bf59..6dbe4050e 100644 --- a/libraries/ZWidget/src/core/truetypefont.h +++ b/libraries/ZWidget/src/core/truetypefont.h @@ -5,6 +5,7 @@ #include #include #include +#include typedef uint8_t ttf_uint8; typedef uint16_t ttf_uint16; diff --git a/libraries/ZWidget/src/widgets/imagebox/imagebox.cpp b/libraries/ZWidget/src/widgets/imagebox/imagebox.cpp index d81a39ab1..45d35a160 100644 --- a/libraries/ZWidget/src/widgets/imagebox/imagebox.cpp +++ b/libraries/ZWidget/src/widgets/imagebox/imagebox.cpp @@ -24,7 +24,6 @@ void ImageBox::SetImage(std::shared_ptr newImage) void ImageBox::OnPaint(Canvas* canvas) { - canvas->fillRect(Rect::xywh(0.0, 0.0, GetWidth(), GetHeight()), Colorf::fromRgba8(0, 0, 0)); if (image) { canvas->drawImage(image, Point((GetWidth() - (double)image->GetWidth()) * 0.5, (GetHeight() - (double)image->GetHeight()) * 0.5)); diff --git a/libraries/ZWidget/src/widgets/lineedit/lineedit.cpp b/libraries/ZWidget/src/widgets/lineedit/lineedit.cpp index bab04c3fb..8a7af4ec4 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(); } }