5 files changed, 16 insertions, 7 deletions
diff --git a/font.c b/font.c
index 0ce87a7..8ae9567 100644
--- a/font.c
+++ b/font.c
@@ -23,12 +23,15 @@ void font_deinit(void)
 
 void font_draw(int x, int y, const char *s)
 {
-	const int ox = x;
 	for (; *s != '\0'; s++) {
 		const char c = toupper(*s);
 		const int ix = c % 16 * FONT_W;
 		const int iy = c / 16 * FONT_H;
-		x += 1;
+		const SDL_Rect src = { ix, iy, FONT_W, FONT_H };
+		const SDL_Rect dest = { x, y, FONT_W, FONT_H };
+		if (SDL_RenderCopy(renderer, font_tex, &src, &dest))
+			fprintf(stderr, "%s\n", SDL_GetError());
+		x += FONT_W;
 	}
 }
 
diff --git a/main.c b/main.c
index ba30aa4..2c789e6 100644
--- a/main.c
+++ b/main.c
@@ -31,6 +31,13 @@ int main(int argc, char **argv)
 			break;
 		}
 
+		mu_begin(mu_ctx);
+		if (mu_begin_window(mu_ctx, "lol", mu_rect(0, 0, 256, 256))) {
+			mu_button(mu_ctx, "kekw");
+			mu_end_window(mu_ctx);
+		}
+		mu_end(mu_ctx);
+
 		r_draw_set_color(0, 0, 0, 1);
 		SDL_RenderClear(renderer);
 		ui_draw();
diff --git a/render.c b/render.c
index 9cb86b4..57f6bde 100644
--- a/render.c
+++ b/render.c
@@ -12,7 +12,7 @@ void r_draw_set_color(int r, int g, int b, int a)
 void r_draw_fill_rect(int x, int y, int w, int h)
 {
 	const SDL_Rect rect = { x, y, w, h };
-	if (SDL_RenderDrawRect(renderer, &rect))
+	if (SDL_RenderFillRect(renderer, &rect))
 		fprintf(stderr, "%s\n", SDL_GetError());
 }
 
diff --git a/text_size.c b/text_size.c
index db718dd..cbbb671 100644
--- a/text_size.c
+++ b/text_size.c
@@ -1,10 +1,11 @@
 #include "text_size.h"
 #include "font.h"
+#include <string.h>
 
 int text_width(mu_Font font, const char *s, int len)
 {
-	(void)font, (void)s;
-	return len * FONT_W;
+	(void)font, (void)len;
+	return strlen(s) * FONT_W;
 }
 
 int text_height(mu_Font font)
diff --git a/ui_draw.c b/ui_draw.c
index 2a73ec1..f04aa2f 100644
--- a/ui_draw.c
+++ b/ui_draw.c
@@ -22,8 +22,6 @@ void ui_draw(void)
 		r_draw_set_color(UNPACK_COLOR(cmd->rect.color));
 		r_draw_fill_rect(UNPACK_RECT(cmd->rect.rect));
 		break;
-	case MU_COMMAND_ICON:
-		break;
 	case MU_COMMAND_CLIP:
 		r_set_clip_rect(UNPACK_RECT(cmd->clip.rect));
 		break;