From 2ed3153670ffba9d43f6033ce89dc33c241de193 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Sat, 25 Sep 2021 18:39:15 -0400
Subject: tk: Define colors within local header

---
(limited to 'src/tk/box.c')

diff --git a/src/tk/box.c b/src/tk/box.c
index da0ef5d..003af66 100644
--- a/src/tk/box.c
+++ b/src/tk/box.c
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "../tk.h"
+#include "style.h"
 #include "widget.h"
 
 struct mftk_box {
@@ -29,7 +30,6 @@ struct mftk_box {
 	int                 container_w;
 	int                 container_h;
 	int                 padding;
-	SDL_Color          *bg_color;
 	struct mftk_widget *child;
 	int                 child_x;
 	int                 child_y;
@@ -97,8 +97,8 @@ _mftk_box_render(struct mftk_widget *w, SDL_Renderer *renderer, int x, int y)
 	rect.w = w->w;
 	rect.h = w->h;
 	if (SDL_SetRenderDrawColor(renderer,
-				b->bg_color->r, b->bg_color->g,
-				b->bg_color->b, b->bg_color->a) < 0 ||
+				MFTK_COLOR_FORM_R, MFTK_COLOR_FORM_G,
+				MFTK_COLOR_FORM_B, MFTK_COLOR_FORM_A) < 0 ||
 			SDL_RenderFillRect(renderer, &rect) < 0) {
 		SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
 				"Couldn't render widget: %s",
@@ -125,7 +125,7 @@ _mftk_box_destroy(struct mftk_widget *w)
 
 struct mftk_widget *
 mftk_box_new(int container_w, int container_h, int own_w, int own_h,
-		int padding, SDL_Color *bg_color, struct mftk_widget *child)
+		int padding, struct mftk_widget *child)
 {
 	struct mftk_widget *w;
 	struct mftk_box    *b;
@@ -137,7 +137,6 @@ mftk_box_new(int container_w, int container_h, int own_w, int own_h,
 	w->w           = own_w;
 	w->h           = own_h;
 	b->padding     = padding;
-	b->bg_color    = bg_color;
 	b->child       = child;
 
 	child->container = w;
--
cgit v0.9.1