From 8f95c62dd3bd4aa1e9d5016bb0de668baa0ad6e3 Mon Sep 17 00:00:00 2001 From: Sam Anthony Date: Thu, 27 Feb 2025 17:51:24 -0500 Subject: select widget: honor width --- main.c | 2 +- widget.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/main.c b/main.c index b8a7bcd..31e2146 100644 --- a/main.c +++ b/main.c @@ -109,7 +109,7 @@ main_window(mu_Context *ctx, UI *ui) { /* TODO */ - mu_layout_row(ctx, 3, (int[]) {128, 15, 128}, 0); + mu_layout_row(ctx, 3, (int[]) {128, 30, 20}, 0); static double value = 0.0; if (w_field(ctx, &ui->displacement) & MU_RES_CHANGE) { diff --git a/widget.c b/widget.c index 8b862a8..a08ded9 100644 --- a/widget.c +++ b/widget.c @@ -44,9 +44,11 @@ int w_select(mu_Context *ctx, w_Select *select) { mu_Id id; mu_Rect r; - int color, res, i; + int width, res, i; mu_layout_begin_column(ctx); + width = -1; + mu_layout_row(ctx, 1, &width, 0); id = mu_get_id(ctx, &select, sizeof(select)); r = mu_layout_next(ctx); @@ -54,11 +56,7 @@ w_select(mu_Context *ctx, w_Select *select) { select->active ^= (ctx->mouse_pressed == MU_MOUSE_LEFT && ctx->focus == id); - color = MU_COLOR_BUTTON; - if (ctx->hover == id) { - color = MU_COLOR_BUTTONHOVER; - } - ctx->draw_frame(ctx, r, color); + mu_draw_control_frame(ctx, id, r, MU_COLOR_BUTTON, 0); const char *label = select->opts[select->idx]; mu_draw_control_text(ctx, label, r, MU_COLOR_TEXT, 0); -- cgit v1.2.3