From ab58151f2afa603108062fb1a1c9d9f3da9e574e Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 18 Jun 2016 22:15:28 +0200 Subject: [PATCH] Fix for TINSIZE | BOLD. If called, BOLD is discarded (#3610) --- radio/src/gui/horus/bitmapbuffer.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/radio/src/gui/horus/bitmapbuffer.cpp b/radio/src/gui/horus/bitmapbuffer.cpp index e516d6987..56eb5ba74 100644 --- a/radio/src/gui/horus/bitmapbuffer.cpp +++ b/radio/src/gui/horus/bitmapbuffer.cpp @@ -311,6 +311,8 @@ void BitmapBuffer::drawSizedText(coord_t x, coord_t y, const char * s, uint8_t l #define INCREMENT_POS(delta) \ do { if (flags & VERTICAL) y -= delta; else x += delta; } while(0) + if ((flags & TINSIZE) && (flags & BOLD)) flags &= ~(BOLD); //TINSIZE | BOLD segfault, so preventing it + int width = getTextWidth(s, len, flags); int height = getFontHeight(flags); int fontindex = FONTSIZE(flags) >> 8;