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 | |
| 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')
| -rw-r--r-- | src/gwin/gwin.c | 8 | ||||
| -rw-r--r-- | src/gwin/gwin.h | 8 | ||||
| -rw-r--r-- | src/gwin/gwin_label.c | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/gwin/gwin.c b/src/gwin/gwin.c index 1f2d44b0..dfd17f66 100644 --- a/src/gwin/gwin.c +++ b/src/gwin/gwin.c @@ -33,7 +33,7 @@ static const gwinVMT basegwinVMT = { static gColor defaultFgColor = GFX_WHITE; static gColor defaultBgColor = GFX_BLACK; #if GDISP_NEED_TEXT - static font_t defaultFont; + static gFont defaultFont; #endif /* These init functions are defined by each module but not published */ @@ -178,11 +178,11 @@ gColor gwinGetDefaultBgColor(void) { } #if GDISP_NEED_TEXT - void gwinSetDefaultFont(font_t font) { + void gwinSetDefaultFont(gFont font) { defaultFont = font; } - font_t gwinGetDefaultFont(void) { + gFont gwinGetDefaultFont(void) { return defaultFont; } #endif @@ -218,7 +218,7 @@ gBool gwinGetEnabled(GHandle gh) { } #if GDISP_NEED_TEXT - void gwinSetFont(GHandle gh, font_t font) { + void gwinSetFont(GHandle gh, gFont font) { gh->font = font; } #endif diff --git a/src/gwin/gwin.h b/src/gwin/gwin.h index aad87efc..557d3373 100644 --- a/src/gwin/gwin.h +++ b/src/gwin/gwin.h @@ -52,7 +52,7 @@ typedef struct GWindowObject { gColor bgcolor; /**< The current background drawing color */ uint32_t flags; /**< Window flags (the meaning is private to the GWIN class) */ #if GDISP_NEED_TEXT - font_t font; /**< The current font */ + gFont font; /**< The current font */ #endif #if GWIN_NEED_CONTAINERS GHandle parent; /**< The parent window */ @@ -174,7 +174,7 @@ gColor gwinGetDefaultBgColor(void); * * @api */ - void gwinSetDefaultFont(font_t font); + void gwinSetDefaultFont(gFont font); /** * @brief Get the current default font @@ -183,7 +183,7 @@ gColor gwinGetDefaultBgColor(void); * * @api */ - font_t gwinGetDefaultFont(void); + gFont gwinGetDefaultFont(void); #endif /*------------------------------------------------- @@ -595,7 +595,7 @@ void gwinRedraw(GHandle gh); * * @api */ - void gwinSetFont(GHandle gh, font_t font); + void gwinSetFont(GHandle gh, gFont font); #endif /*------------------------------------------------- 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; |