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/tools | |
| 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/tools')
| -rw-r--r-- | demos/tools/touch_calibration_grabber/main.c | 2 | ||||
| -rw-r--r-- | demos/tools/touch_driver_test/main.c | 2 | ||||
| -rw-r--r-- | demos/tools/touch_raw_readings/main.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/demos/tools/touch_calibration_grabber/main.c b/demos/tools/touch_calibration_grabber/main.c index ac55f051..81032b83 100644 --- a/demos/tools/touch_calibration_grabber/main.c +++ b/demos/tools/touch_calibration_grabber/main.c @@ -55,7 +55,7 @@ int main(void) { // Create our title font = gdispOpenFont("UI2"); gwinSetDefaultFont(font); - bHeight = gdispGetFontMetric(font, fontHeight)+4; + bHeight = gdispGetFontMetric(font, gFontHeight)+4; gdispFillStringBox(0, 0, swidth, bHeight, "Touchscreen Calibration Grabber", font, GFX_RED, GFX_WHITE, gJustifyCenter); // Create our main display writing window diff --git a/demos/tools/touch_driver_test/main.c b/demos/tools/touch_driver_test/main.c index 08d6da3b..3915c2a8 100644 --- a/demos/tools/touch_driver_test/main.c +++ b/demos/tools/touch_driver_test/main.c @@ -115,7 +115,7 @@ int main(void) { bHeight = gdispGetStringWidth("-", font)*2; if (bHeight > bWidth2) bWidth2 = bHeight; bWidth2 += 4; - bHeight = gdispGetFontMetric(font, fontHeight)*2+2; + bHeight = gdispGetFontMetric(font, gFontHeight)*2+2; // Create our main display window { diff --git a/demos/tools/touch_raw_readings/main.c b/demos/tools/touch_raw_readings/main.c index 416b75a5..9077b1ac 100644 --- a/demos/tools/touch_raw_readings/main.c +++ b/demos/tools/touch_raw_readings/main.c @@ -60,7 +60,7 @@ int main(void) { // Create our title font = gdispOpenFont("UI2"); gwinSetDefaultFont(font); - bHeight = gdispGetFontMetric(font, fontHeight)+4; + bHeight = gdispGetFontMetric(font, gFontHeight)+4; gdispFillStringBox(0, 0, swidth, bHeight, "Raw Touch Readings", font, GFX_RED, GFX_WHITE, gJustifyCenter); // Create our main display writing window |