diff options
| author | inmarket <andrewh@inmarket.com.au> | 2018-07-08 12:50:05 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2018-07-08 12:50:05 +1000 |
| commit | a24fab0d7217aaae1463f62d5d1381ef820cfa17 (patch) | |
| tree | 73f3bb1b93d13d9ee4161e0a994e5b53f70af93b /src/gwin/gwin_list.c | |
| parent | 2e8eaa34717f99c9696867b62ff5f19e76a7ccf8 (diff) | |
| download | uGFX-a24fab0d7217aaae1463f62d5d1381ef820cfa17.tar.gz uGFX-a24fab0d7217aaae1463f62d5d1381ef820cfa17.tar.bz2 uGFX-a24fab0d7217aaae1463f62d5d1381ef820cfa17.zip | |
Added type gFontmetric to replace V2.x fontmetric_t, and values gFontXXX replace fontXXX
Diffstat (limited to 'src/gwin/gwin_list.c')
| -rw-r--r-- | src/gwin/gwin_list.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gwin/gwin_list.c b/src/gwin/gwin_list.c index d832f99a..cd21623d 100644 --- a/src/gwin/gwin_list.c +++ b/src/gwin/gwin_list.c @@ -60,7 +60,7 @@ static void sendListEvent(GWidgetObject *gw, int item) { gCoord iheight; (void) x; - iheight = gdispGetFontMetric(gw->g.font, fontHeight) + LST_VERT_PAD; + iheight = gdispGetFontMetric(gw->g.font, gFontHeight) + LST_VERT_PAD; // Handle click over the list area item = (gw2obj->top + y) / iheight; @@ -101,7 +101,7 @@ static void sendListEvent(GWidgetObject *gw, int item) { return; // Some initial stuff - iheight = gdispGetFontMetric(gw->g.font, fontHeight) + LST_VERT_PAD; + iheight = gdispGetFontMetric(gw->g.font, gFontHeight) + LST_VERT_PAD; pgsz = gw->g.height-2; // Handle click over the scroll bar @@ -163,7 +163,7 @@ static void sendListEvent(GWidgetObject *gw, int item) { if (gw2obj->last_mouse_y != y) { oldtop = gw2obj->top; - iheight = gdispGetFontMetric(gw->g.font, fontHeight) + LST_VERT_PAD; + iheight = gdispGetFontMetric(gw->g.font, gFontHeight) + LST_VERT_PAD; gw2obj->top -= y - gw2obj->last_mouse_y; if (gw2obj->top >= gw2obj->cnt * iheight - (gw->g.height-2)) @@ -185,7 +185,7 @@ static void sendListEvent(GWidgetObject *gw, int item) { int i; gCoord iheight; - iheight = gdispGetFontMetric(gw->g.font, fontHeight) + LST_VERT_PAD; + iheight = gdispGetFontMetric(gw->g.font, gFontHeight) + LST_VERT_PAD; switch (role) { // select down @@ -664,7 +664,7 @@ void gwinListViewItem(GHandle gh, int item) { return; // Work out a possible new top for the list - iheight = gdispGetFontMetric(gh->font, fontHeight) + LST_VERT_PAD; + iheight = gdispGetFontMetric(gh->font, gFontHeight) + LST_VERT_PAD; gh2obj->top = iheight * item; // Adjust the list @@ -725,7 +725,7 @@ void gwinListDefaultDraw(GWidgetObject* gw, void* param) { return; ps = (gw->g.flags & GWIN_FLG_SYSENABLED) ? &gw->pstyle->enabled : &gw->pstyle->disabled; - iheight = gdispGetFontMetric(gw->g.font, fontHeight) + LST_VERT_PAD; + iheight = gdispGetFontMetric(gw->g.font, gFontHeight) + LST_VERT_PAD; x = 1; // the scroll area |