Mercurial > molko
changeset 542:82fd0dd6cc19
examples: improve mlk_trace_hud
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Sun, 05 Mar 2023 13:10:13 +0100 |
| parents | 970cad994a95 |
| children | c32d7a98bde1 |
| files | libmlk-example/mlk/example/trace-hud.c libmlk-example/mlk/example/trace-hud.h |
| diffstat | 2 files changed, 18 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/libmlk-example/mlk/example/trace-hud.c Sun Mar 05 13:02:07 2023 +0100 +++ b/libmlk-example/mlk/example/trace-hud.c Sun Mar 05 13:10:13 2023 +0100 @@ -24,12 +24,13 @@ #include <mlk/core/trace.h> #include <mlk/core/window.h> -#include <mlk/ui/label.h> +#include <mlk/ui/align.h> +#include <mlk/ui/ui.h> #include "trace-hud.h" -#define LINES_MAX (4) -#define THEME(t) ((t) ? (t) : &mlk_theme) +#define PAD (2) +#define LINES_MAX (8) static struct { char lines[LINES_MAX + 1][MLK_TRACE_LINE_MAX]; @@ -86,26 +87,24 @@ void mlk_trace_hud_draw(void) { -#if 0 - struct mlk_theme *th; - int x, y; + struct mlk_font *font; + unsigned fh; - th = THEME(mlk_trace_hud.theme); - x = th->padding; - y = th->padding; + font = mlk_ui_fonts[MLK_UI_FONT_INTERFACE]; + fh = mlk_font_height(font); for (int i = 0; i < LINES_MAX && data.lines[i][0]; ++i) { - mlk_label_draw(&(struct mlk_label) { - .x = x, - .y = y, - .text = data.lines[i], - .flags = MLK_LABEL_FLAGS_SHADOW - }); - - y += mlk_font_height(th->fonts[MLK_THEME_FONT_INTERFACE]); - y += th->padding; + mlk_ui_draw_text( + MLK_ALIGN_NONE, + font, + MLK_UI_COLOR_DEBUG, + data.lines[i], + PAD, + PAD + (i * fh), + 0, + 0 + ); } -#endif } void
--- a/libmlk-example/mlk/example/trace-hud.h Sun Mar 05 13:02:07 2023 +0100 +++ b/libmlk-example/mlk/example/trace-hud.h Sun Mar 05 13:10:13 2023 +0100 @@ -21,10 +21,7 @@ #define MLK_TRACE_HUD_TIMEOUT_DEFAULT (3000) -struct mlk_theme; - struct mlk_trace_hud { - struct mlk_theme *theme; unsigned int timeout; };