diff options
Diffstat (limited to 'src/tk/button.c')
| -rw-r--r-- | src/tk/button.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/tk/button.c b/src/tk/button.c index 1152bd9..47f59f6 100644 --- a/src/tk/button.c +++ b/src/tk/button.c @@ -19,12 +19,12 @@ #include <SDL.h> #include "../tk.h" +#include "style.h" #include "widget.h" struct mftk_button { struct mftk_widget parent; struct mftk_widget *label; - SDL_Color *fill_color; int padding; int (*action)(void *); void *user_data; @@ -113,8 +113,8 @@ _mftk_button_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->fill_color->r, b->fill_color->g, - b->fill_color->b, b->fill_color->a) < 0 || + MFTK_COLOR_BUTN_R, MFTK_COLOR_BUTN_G, + MFTK_COLOR_BUTN_B, MFTK_COLOR_BUTN_A) < 0 || SDL_RenderFillRect(renderer, &rect) < 0) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't render widget: %s", @@ -139,8 +139,7 @@ _mftk_button_destroy(struct mftk_widget *w) } struct mftk_widget * -mftk_button_new(TTF_Font *font, const char *text, SDL_Color *text_color, - SDL_Color *fill_color, int padding, +mftk_button_new(TTF_Font *font, const char *text, int padding, int (*action)(void *), void *user_data, SDL_Renderer *renderer) { struct mftk_widget *w; @@ -148,16 +147,15 @@ mftk_button_new(TTF_Font *font, const char *text, SDL_Color *text_color, mftk_widget_init_focusable(w, b, button); - b->label = mftk_label_new(font, text, text_color, renderer); + b->label = mftk_label_new(font, text, renderer); if (b->label == NULL) { free(b); return NULL; } - b->fill_color = fill_color; - b->padding = padding; - b->action = action; - b->user_data = user_data; + b->padding = padding; + b->action = action; + b->user_data = user_data; return w; } |