From 2ed3153670ffba9d43f6033ce89dc33c241de193 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Sat, 25 Sep 2021 18:39:15 -0400 Subject: tk: Define colors within local header --- (limited to 'src/tk/label.c') diff --git a/src/tk/label.c b/src/tk/label.c index dcd827e..bd4e5a4 100644 --- a/src/tk/label.c +++ b/src/tk/label.c @@ -20,6 +20,7 @@ #include #include #include "../tk.h" +#include "style.h" #include "widget.h" struct mftk_label { @@ -29,6 +30,11 @@ struct mftk_label { int h; }; +static SDL_Color _mftk_label_color = { + .r = MFTK_COLOR_FORE_R, .g = MFTK_COLOR_FORE_G, + .b = MFTK_COLOR_FORE_B, .a = MFTK_COLOR_FORE_A +}; + static void _mftk_label_layout(struct mftk_widget *w __attribute__((__unused__))) { @@ -75,8 +81,7 @@ _mftk_label_destroy(struct mftk_widget *w) } struct mftk_widget * -mftk_label_new(TTF_Font *font, const char *text, SDL_Color *color, - SDL_Renderer *renderer) +mftk_label_new(TTF_Font *font, const char *text, SDL_Renderer *renderer) { struct mftk_widget *w; struct mftk_label *l; @@ -89,7 +94,7 @@ mftk_label_new(TTF_Font *font, const char *text, SDL_Color *color, mftk_widget_init(w, l, label); - surface = TTF_RenderUTF8_Blended(font, text, *color); + surface = TTF_RenderUTF8_Blended(font, text, _mftk_label_color); if (surface == NULL) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't create surface: %s", -- cgit v0.9.1