diff options
author | inmarket <inmarket@ugfx.org> | 2017-03-11 14:39:53 +1000 |
---|---|---|
committer | inmarket <inmarket@ugfx.org> | 2017-03-11 14:39:53 +1000 |
commit | d8c9ca184f29800f6c23d02bc450ea0e67981990 (patch) | |
tree | 04170629b4b1f755fab2eb04eaf711c3571830a7 /src/gdisp/gdisp.h | |
parent | 9500ed2bcc8c579bd56f4e4cdb27376ebc727046 (diff) | |
download | uGFX-d8c9ca184f29800f6c23d02bc450ea0e67981990.tar.gz uGFX-d8c9ca184f29800f6c23d02bc450ea0e67981990.tar.bz2 uGFX-d8c9ca184f29800f6c23d02bc450ea0e67981990.zip |
Fix font baseline_x problem, decrease word-wrap stack usage, add text justification options
Diffstat (limited to 'src/gdisp/gdisp.h')
-rw-r--r-- | src/gdisp/gdisp.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/gdisp/gdisp.h b/src/gdisp/gdisp.h index 706bc700..4a097604 100644 --- a/src/gdisp/gdisp.h +++ b/src/gdisp/gdisp.h @@ -58,10 +58,19 @@ typedef struct point { * @brief Type for the text justification. */ typedef enum justify { - justifyLeft = 0, /**< Justify Left */ - justifyCenter = 1, /**< Justify Center */ - justifyRight = 2 /**< Justify Right */ + justifyLeft = 0x00, /**< Justify Left (the default) */ + justifyCenter = 0x01, /**< Justify Center */ + justifyRight = 0x02, /**< Justify Right */ + justifyTop = 0x10, /**< Justify Top */ + justifyMiddle = 0x00, /**< Justify Middle (the default) */ + justifyBottom = 0x20, /**< Justify Bottom */ + justifyWordWrap = 0x00, /**< Word wrap (the default if GDISP_NEED_TEXT_WORDWRAP is on) */ + justifyNoWordWrap = 0x40, /**< No word wrap */ + justifyPad = 0x00, /**< Pad the text box (the default) */ + justifyNoPad = 0x04 /**< No padding the text box */ } justify_t; +#define JUSTIFYMASK_LEFTRIGHT (justifyLeft|justifyCenter|justifyRight) +#define JUSTIFYMASK_TOPBOTTOM (justifyTop|justifyMiddle|justifyBottom) /** * @enum fontmetric |