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 /demos/modules | |
| 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 'demos/modules')
| -rw-r--r-- | demos/modules/gdisp/fonts/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demos/modules/gdisp/fonts/main.c b/demos/modules/gdisp/fonts/main.c index 9c351de8..ce66aabd 100644 --- a/demos/modules/gdisp/fonts/main.c +++ b/demos/modules/gdisp/fonts/main.c @@ -53,8 +53,8 @@ int main(void) { //font2 = gdispOpenFont("Apple*"); y = 0; - fheight1 = gdispGetFontMetric(font1, fontHeight)+2; - fheight2 = gdispGetFontMetric(font2, fontHeight)+2; + fheight1 = gdispGetFontMetric(font1, gFontHeight)+2; + fheight2 = gdispGetFontMetric(font2, gFontHeight)+2; line1 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; line2 = "0123456789~!@#$%^&*_-+=(){}[]<>|/\\:;,.?'\"`"; |