diff options
author | inmarket <andrewh@inmarket.com.au> | 2013-08-01 15:06:32 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2013-08-01 15:06:32 +1000 |
commit | 157ec08034c44957afbc24a16486a680708a4379 (patch) | |
tree | 7045ff788027ef36e3eaaa671f69e477783fc2fe /include/gdisp | |
parent | db189048929220a2a9bd83157022eb096cf6f993 (diff) | |
parent | b0b35396395c3eadc5a656df995a17b266c4b374 (diff) | |
download | uGFX-157ec08034c44957afbc24a16486a680708a4379.tar.gz uGFX-157ec08034c44957afbc24a16486a680708a4379.tar.bz2 uGFX-157ec08034c44957afbc24a16486a680708a4379.zip |
Merge branch 'master' into fonts
Diffstat (limited to 'include/gdisp')
-rw-r--r-- | include/gdisp/gdisp.h | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/include/gdisp/gdisp.h b/include/gdisp/gdisp.h index aa418cdb..b82c9f3c 100644 --- a/include/gdisp/gdisp.h +++ b/include/gdisp/gdisp.h @@ -775,18 +775,6 @@ void gdispDrawBox(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color); const char *gdispGetFontName(font_t font); #endif -/** - * @brief Blend two colors together according to opacity/alpha. - * @return The blended color. - * - * @param[in] fg Foreground color - * @param[in] bg Background color - * @param[in] alpha Opacity of the foreground color (0-255) - * - * @api - */ -color_t gdispBlendColor(color_t fg, color_t bg, uint8_t alpha); - /* Extra Arc Functions */ #if GDISP_NEED_ARC || defined(__DOXYGEN__) @@ -815,6 +803,19 @@ color_t gdispBlendColor(color_t fg, color_t bg, uint8_t alpha); void gdispFillRoundedBox(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t radius, color_t color); #endif + +/** + * @brief Blend 2 colors according to the alpha + * @return The combined color + * + * @param[in] fg The foreground color + * @param[in] bg The background color + * @param[in] alpha The alpha value (0-255). 0 is all background, 255 is all foreground. + * + * @api + */ +color_t gdispBlendColor(color_t fg, color_t bg, uint8_t alpha); + /* Support routine for packed pixel formats */ #if !defined(gdispPackPixels) || defined(__DOXYGEN__) /** |