From 0c57b2ef34fe2ce546f00af92a329b1008cf7f14 Mon Sep 17 00:00:00 2001 From: Peter Lebbing Date: Sun, 13 Aug 2017 17:39:56 +0200 Subject: [PATCH] Cut off strings too long to show in ugfx.List. --- esp32/ugfx_widgets.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/esp32/ugfx_widgets.c b/esp32/ugfx_widgets.c index 7055618d5..6c39fa2bc 100644 --- a/esp32/ugfx_widgets.c +++ b/esp32/ugfx_widgets.c @@ -635,7 +635,13 @@ void BWgwinListDefaultDraw(GWidgetObject* gw, void* param) { } } #endif - gdispGFillStringBox(gw->g.display, gw->g.x+x+LST_HORIZ_PAD, gw->g.y+y, iwidth-LST_HORIZ_PAD, iheight, qi2li->text, gw->g.font, text, fill, justifyLeft); + #if GDISP_NEED_CLIP + gdispGSetClip(gw->g.display, gw->g.x+x+LST_HORIZ_PAD, gw->g.y+y, iwidth-LST_HORIZ_PAD, MIN(iheight, gw->g.height-y-1)); + #endif + gdispGFillString(gw->g.display, gw->g.x+x+LST_HORIZ_PAD, gw->g.y+y, qi2li->text, gw->g.font, text, fill); + #if GDISP_NEED_CLIP + gdispGSetClip(gw->g.display, gw->g.x+1, gw->g.y+1, gw->g.width-2, gw->g.height-2); + #endif } // Fill any remaining item space