aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@seriouslyembedded.com>2015-08-14 19:36:01 +0200
committerJoel Bodenmann <joel@seriouslyembedded.com>2015-08-14 19:36:01 +0200
commit608290a261b5577825a31fb4f821e263bc43c094 (patch)
tree714cac8c4015d1f9a5a061bcf2cdcaa680816ed8
parent668257c87262f044ff3858224ba0646f690cd706 (diff)
downloaduGFX-608290a261b5577825a31fb4f821e263bc43c094.tar.gz
uGFX-608290a261b5577825a31fb4f821e263bc43c094.tar.bz2
uGFX-608290a261b5577825a31fb4f821e263bc43c094.zip
Adding more font metrics
-rw-r--r--src/gdisp/gdisp.c2
-rw-r--r--src/gdisp/gdisp.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/gdisp/gdisp.c b/src/gdisp/gdisp.c
index 377ccddb..43b470b2 100644
--- a/src/gdisp/gdisp.c
+++ b/src/gdisp/gdisp.c
@@ -3313,6 +3313,8 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
case fontCharPadding: return 0;
case fontMinWidth: return font->min_x_advance;
case fontMaxWidth: return font->max_x_advance;
+ case fontBaselineX: return font->baseline_x;
+ case fontBaselineY: return font->baseline_y;
}
return 0;
}
diff --git a/src/gdisp/gdisp.h b/src/gdisp/gdisp.h
index 1bc1c445..298258cb 100644
--- a/src/gdisp/gdisp.h
+++ b/src/gdisp/gdisp.h
@@ -72,7 +72,9 @@ typedef enum fontmetric {
fontLineSpacing, /**< The line spacing */
fontCharPadding, /**< The char padding */
fontMinWidth, /**< The minimum width */
- fontMaxWidth /**< The maximum width */
+ fontMaxWidth, /**< The maximum width */
+ fontBaselineX, /**< The base line in x direction */
+ fontBaselineY /**< The base line in y direction */
} fontmetric_t;
/**