diff options
| author | Marvin Borner | 2021-02-17 22:13:59 +0100 |
|---|---|---|
| committer | Marvin Borner | 2021-02-18 18:03:43 +0100 |
| commit | e28ea65105c4afd3a3dea7d050b392565d15120d (patch) | |
| tree | f3c1eaf8c4da5d71893355db1779d73d98f68d2f /libtxt | |
| parent | b32cb0a22db893c106cb86ca0f1178d5da05b551 (diff) | |
Started GUI rewrite
It's a mess right now..
Diffstat (limited to 'libtxt')
| -rw-r--r-- | libtxt/html.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/libtxt/html.c b/libtxt/html.c index eca2feb..f40f7b3 100644 --- a/libtxt/html.c +++ b/libtxt/html.c @@ -169,33 +169,35 @@ static struct html_element *render_object(struct html_element *container, struct gui_add_label(container->obj, container->x_offset, container->y_offset, FONT_32, dom->content, COLOR_WHITE, COLOR_BLACK); container->x_offset = 0; - container->y_offset += obj->ctx->height; + container->y_offset += obj->ctx->size.y; return new_html_element(obj, dom); } else if (CMP(tag, "h2")) { struct element *obj = gui_add_label(container->obj, container->x_offset, container->y_offset, FONT_24, dom->content, COLOR_WHITE, COLOR_BLACK); container->x_offset = 0; - container->y_offset += obj->ctx->height; + container->y_offset += obj->ctx->size.y; return new_html_element(obj, dom); } else if (CMP(tag, "h3")) { struct element *obj = gui_add_label(container->obj, container->x_offset, container->y_offset, FONT_16, dom->content, COLOR_WHITE, COLOR_BLACK); container->x_offset = 0; - container->y_offset += obj->ctx->height; + container->y_offset += obj->ctx->size.y; return new_html_element(obj, dom); } else if (CMP(tag, "p")) { struct element *obj = gui_add_label(container->obj, container->x_offset, container->y_offset, FONT_16, dom->content, COLOR_WHITE, COLOR_BLACK); container->x_offset = 0; - container->y_offset += obj->ctx->height; + container->y_offset += obj->ctx->size.y; return new_html_element(obj, dom); } else if (CMP(tag, "hr")) { - gfx_draw_rectangle(container->obj->ctx, container->x_offset, container->y_offset, - container->obj->ctx->width - container->x_offset, - container->y_offset + 2, COLOR_BLACK); + gfx_draw_rectangle(container->obj->ctx, + vec2(container->x_offset, container->y_offset), + vec2(container->obj->ctx->size.x - container->x_offset, + container->y_offset + 2), + COLOR_BLACK); container->x_offset = 0; container->y_offset += 2; return container; @@ -208,7 +210,7 @@ static struct html_element *render_object(struct html_element *container, struct container->y_offset, FONT_16, dom->content, COLOR_WHITE, COLOR_BLACK); container->x_offset = 0; - container->y_offset += obj->ctx->height; + container->y_offset += obj->ctx->size.y; return new_html_element(obj, dom); } return container; |