From ac2baed7e5d733ca93efb25e8795687ffa6e394c Mon Sep 17 00:00:00 2001 From: inmarket Date: Thu, 1 Aug 2013 18:12:58 +1000 Subject: [PATCH 1/2] Update widget demo so list 3 is multi-select --- demos/modules/gwin/widgets/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c index 5f780193..2daffee3 100644 --- a/demos/modules/gwin/widgets/main.c +++ b/demos/modules/gwin/widgets/main.c @@ -181,7 +181,7 @@ static void createWidgets(void) { gwinListAddItem(ghList2, "Item 8", FALSE); gwinListAddItem(ghList2, "Item 9", FALSE); gwinListAddItem(ghList2, "Item 10", FALSE); gwinListAddItem(ghList2, "Item 11", FALSE); gwinListAddItem(ghList2, "Item 12", FALSE); gwinListAddItem(ghList2, "Item 13", FALSE); - wi.g.x = 0+2*(LIST_WIDTH+1); wi.text = "L3"; ghList3 = gwinListCreate(NULL, &wi, FALSE); + wi.g.x = 0+2*(LIST_WIDTH+1); wi.text = "L3"; ghList3 = gwinListCreate(NULL, &wi, TRUE); gwinListAddItem(ghList3, "Item 0", FALSE); gwinListAddItem(ghList3, "Item 1", FALSE); gwinListAddItem(ghList3, "Item 2", FALSE); gwinListAddItem(ghList3, "Item 3", FALSE); gdispImageSetMemoryReader(&imgYesNo, image_yesno); From 118f87afb1604a3defd0952512f7bb29d1b82f54 Mon Sep 17 00:00:00 2001 From: inmarket Date: Thu, 1 Aug 2013 18:13:21 +1000 Subject: [PATCH 2/2] Fix GWIN lists font handling. --- src/gwin/list.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gwin/list.c b/src/gwin/list.c index cf567a81..5407cb36 100644 --- a/src/gwin/list.c +++ b/src/gwin/list.c @@ -89,7 +89,7 @@ static void gwinListDefaultDraw(GWidgetObject* gw, void* param) { #endif ps = (gw->g.flags & GWIN_FLG_ENABLED) ? &gw->pstyle->enabled : &gw->pstyle->disabled; - iheight = gdispGetFontMetric(gwinGetDefaultFont(), fontHeight) + TEXTGAP; + iheight = gdispGetFontMetric(gw->g.font, fontHeight) + TEXTGAP; x = 1; // the scroll area @@ -139,7 +139,7 @@ static void gwinListDefaultDraw(GWidgetObject* gw, void* param) { } } #endif - gdispFillStringBox(gw->g.x+x, gw->g.y+y, iwidth, iheight, qi2li->text, gwinGetDefaultFont(), ps->text, fill, justifyLeft); + gdispFillStringBox(gw->g.x+x, gw->g.y+y, iwidth, iheight, qi2li->text, gw->g.font, ps->text, fill, justifyLeft); } // Fill any remaining item space @@ -158,7 +158,7 @@ static void gwinListDefaultDraw(GWidgetObject* gw, void* param) { coord_t iheight; (void) x; - iheight = gdispGetFontMetric(gwinGetDefaultFont(), fontHeight) + TEXTGAP; + iheight = gdispGetFontMetric(gw->g.font, fontHeight) + TEXTGAP; pgsz = (gw->g.height-2)/iheight; if (pgsz < 1) pgsz = 1;