aboutsummaryrefslogtreecommitdiffstats
path: root/src/gdisp/gdisp.h
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2018-07-08 13:25:20 +1000
committerinmarket <andrewh@inmarket.com.au>2018-07-08 13:25:20 +1000
commitd9258efd4dac2b7939bb11707cbbdfa135c02bf5 (patch)
tree7408732aa3996a4d389515193cfa6eb05a726abc /src/gdisp/gdisp.h
parentcbf1d4dfa095bc1fae927228ad108b6086738f01 (diff)
downloaduGFX-d9258efd4dac2b7939bb11707cbbdfa135c02bf5.tar.gz
uGFX-d9258efd4dac2b7939bb11707cbbdfa135c02bf5.tar.bz2
uGFX-d9258efd4dac2b7939bb11707cbbdfa135c02bf5.zip
Added macros JUSTIFYMASK_HORIZONTAL, JUSTIFYMASK_VERTICAL to replace macros JUSTIFYMASK_LEFTRIGHT, JUSTIFYMASK_TOPBOTTOM
Diffstat (limited to 'src/gdisp/gdisp.h')
-rw-r--r--src/gdisp/gdisp.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gdisp/gdisp.h b/src/gdisp/gdisp.h
index 338ec5a0..8a573456 100644
--- a/src/gdisp/gdisp.h
+++ b/src/gdisp/gdisp.h
@@ -69,8 +69,8 @@ typedef enum gJustify {
gJustifyPad = 0x00, /**< Pad the text box (the default) */
gJustifyNoPad = 0x04 /**< No padding the text box */
} gJustify;
-#define JUSTIFYMASK_LEFTRIGHT (gJustifyLeft|gJustifyCenter|gJustifyRight)
-#define JUSTIFYMASK_TOPBOTTOM (gJustifyTop|gJustifyMiddle|gJustifyBottom)
+#define JUSTIFYMASK_HORIZONTAL (gJustifyLeft|gJustifyCenter|gJustifyRight)
+#define JUSTIFYMASK_VERTICAL (gJustifyTop|gJustifyMiddle|gJustifyBottom)
/**
* @enum gFontmetric
@@ -1251,6 +1251,8 @@ void gdispGDrawBox(GDisplay *g, gCoord x, gCoord y, gCoord cx, gCoord cy, gColor
#define justifyNoWordWrap gJustifyNoWordWrap
#define justifyPad gJustifyPad
#define justifyNoPad gJustifyNoPad
+ #define JUSTIFYMASK_LEFTRIGHT JUSTIFYMASK_HORIZONTAL
+ #define JUSTIFYMASK_TOPBOTTOM JUSTIFYMASK_VERTICAL
typedef gFontmetric fontmetric_t;
#define fontHeight gFontHeight
#define fontDescendersHeight gFontDescendersHeight