diff options
author | inmarket <andrewh@inmarket.com.au> | 2018-07-08 13:05:27 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2018-07-08 13:05:27 +1000 |
commit | cbf1d4dfa095bc1fae927228ad108b6086738f01 (patch) | |
tree | 158ad908c0cd4d2f96218dfbbf8eb647c2609b91 /src/gwin/gwin_label.c | |
parent | a24fab0d7217aaae1463f62d5d1381ef820cfa17 (diff) | |
download | uGFX-cbf1d4dfa095bc1fae927228ad108b6086738f01.tar.gz uGFX-cbf1d4dfa095bc1fae927228ad108b6086738f01.tar.bz2 uGFX-cbf1d4dfa095bc1fae927228ad108b6086738f01.zip |
Added type gFont to replace V2.x font_t
Diffstat (limited to 'src/gwin/gwin_label.c')
-rw-r--r-- | src/gwin/gwin_label.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gwin/gwin_label.c b/src/gwin/gwin_label.c index 97b9f304..79f0388d 100644 --- a/src/gwin/gwin_label.c +++ b/src/gwin/gwin_label.c @@ -21,14 +21,14 @@ #define gw2obj ((GLabelObject *)gw) // simple: single line with no wrapping -static gCoord getwidth(const char *text, font_t font, gCoord maxwidth) { +static gCoord getwidth(const char *text, gFont font, gCoord maxwidth) { (void) maxwidth; return gdispGetStringWidth(text, font)+2; // Allow one pixel of padding on each side } // simple: single line with no wrapping -static gCoord getheight(const char *text, font_t font, gCoord maxwidth) { +static gCoord getheight(const char *text, gFont font, gCoord maxwidth) { (void) text; (void) maxwidth; |