From 0e30d188a7f19a9ea8d24286c16ecdd6599b687c Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Sun, 3 Aug 2025 02:33:29 -0400 Subject: lib: libgfx: Move color defines to draw.h Signed-off-by: Ian Moffett --- lib/libgfx/include/libgfx/draw.h | 11 +++++++++++ lib/libgfx/include/libgfx/gfx.h | 13 ------------- 2 files changed, 11 insertions(+), 13 deletions(-) (limited to 'lib/libgfx') diff --git a/lib/libgfx/include/libgfx/draw.h b/lib/libgfx/include/libgfx/draw.h index 60d2b24..3bd013a 100644 --- a/lib/libgfx/include/libgfx/draw.h +++ b/lib/libgfx/include/libgfx/draw.h @@ -36,6 +36,17 @@ /* Shape types */ #define SHAPE_SQUARE 0x00000000 +/* Basic color defines */ +#define GFX_BLACK 0x000000 +#define GFX_RED 0xFF0000 +#define GFX_GREEN 0x00FF00 +#define GFX_BLUE 0x0000FF +#define GFX_WHITE 0xFFFFFF +#define GFX_PURPLE 0x800080 +#define GFX_YELLOW 0xFFFF00 +#define GFX_DARK 0x1D2021 +#define GFX_AQUA 0x427B58 + /* * Default shape initializer, something that * works and can be tweaked. The idea of this diff --git a/lib/libgfx/include/libgfx/gfx.h b/lib/libgfx/include/libgfx/gfx.h index 8ff48b4..67a1006 100644 --- a/lib/libgfx/include/libgfx/gfx.h +++ b/lib/libgfx/include/libgfx/gfx.h @@ -47,19 +47,6 @@ typedef uint32_t pixel_t; typedef pixel_t color_t; -/* - * Basic color defines - */ -#define GFX_BLACK 0x000000 -#define GFX_RED 0xFF0000 -#define GFX_GREEN 0x00FF00 -#define GFX_BLUE 0x0000FF -#define GFX_WHITE 0xFFFFFF -#define GFX_PURPLE 0x800080 -#define GFX_YELLOW 0xFFFF00 -#define GFX_DARK 0x1D2021 -#define GFX_AQUA 0x427B58 - /* * Represents cartesian x/y values */ -- cgit v1.2.3