From e1b941ef977e55f8a0f97d76dfd1caab3374a464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Madar=C3=A1sz?= Date: Sun, 16 May 2021 16:30:13 +0200 Subject: [PATCH] improve color picker layouting + prop spacing --- art/demo.ecotex | Bin 177 -> 177 bytes code/game/source/editors/texed_widgets.c | 7 +++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/art/demo.ecotex b/art/demo.ecotex index 8e5c93fc99b4b633086c44d48a09b84bb1b8ccfc..f7c40e46a16116a71e9c853bcc12d0e4fe768b11 100644 GIT binary patch delta 15 XcmdnUxRH^ane~*zjK_Tw*;fGoD9;7S delta 15 WcmdnUxRH^ane~)I0|UcE_Ei8Om;^uo diff --git a/code/game/source/editors/texed_widgets.c b/code/game/source/editors/texed_widgets.c index ac7c6b7..cbcbcdc 100644 --- a/code/game/source/editors/texed_widgets.c +++ b/code/game/source/editors/texed_widgets.c @@ -240,13 +240,14 @@ void texed_draw_props_pane(zpl_aabb2 r) { zpl_aabb2 column_1_r = zpl_aabb2_cut_left(&r, dims.width/2.0f); zpl_aabb2 column_2_r = r; - float prop_height = 20.0f; + float prop_height = 25.0f; int prop_column_treshold = (int)zpl_floor(dims.height / prop_height); for (int i = 0; i < op->num_params; i += 1) { td_param *p = &op->params[i]; zpl_aabb2 *c = (i >= prop_column_treshold) ? &column_2_r : &column_1_r; zpl_aabb2 item = zpl_aabb2_cut_top(c, prop_height); + zpl_aabb2_cut_bottom(&item, 5.0f); zpl_aabb2 label_r = zpl_aabb2_cut_left(&item, dims.width/6.0f); zpl_aabb2 tbox_r = item; @@ -264,7 +265,9 @@ void texed_draw_props_pane(zpl_aabb2 r) { } if (p->edit_mode) { - zpl_aabb2 extra_r = zpl_aabb2_add_bottom(&tbox_r, prop_height*4.0f); + zpl_aabb2 extra_r = zpl_aabb2_cut_top(c, prop_height*4.0f + 50.0f); + zpl_aabb2_cut_bottom(&extra_r, 50.0f); + zpl_aabb2_cut_left(&extra_r, dims.width/6.0f); DrawRectangleRec(aabb2_ray(extra_r), GRAY); zpl_aabb2 ok_r = zpl_aabb2_cut_left(&extra_r, 50.0f);