fix ui tags-key/name -> color mapping; if a pattern is too specific, it should never match more general queries. but more specific queries can match less general patterns

This commit is contained in:
Ryan Fleury committed 2025-04-28 16:43:39 -07:00
1 parent 33479ec732
commit a2ba3933cf
4 files changed
+21 -8

No files matched your search

+7 -1
View File
@@ -3649,12 +3649,18 @@ RD_VIEW_UI_FUNCTION_DEF(color)
{
UI_Signal sv_sig = ui_sat_val_pickerf(hsva.x, &hsva.y, &hsva.z, "sat_val_picker");
UI_Signal h_sig = {0};
UI_Signal a_sig = {0};
ui_spacer(ui_em(1.f, 1.f));
UI_PrefWidth(ui_em(3.f, 1.f))
{
h_sig = ui_hue_pickerf(&hsva.x, hsva.y, hsva.z, "hue_picker");
}
ui_spacer(ui_em(1.f, 1.f));
UI_PrefWidth(ui_em(3.f, 1.f))
{
a_sig = ui_alpha_pickerf(&hsva.w, "alpha_picker");
}
ui_spacer(ui_em(1.f, 1.f));
UI_PrefWidth(ui_children_sum(1)) UI_Column
{
UI_PrefWidth(ui_em(6.f, 0.f)) UI_PrefHeight(ui_em(6.f, 0.f))
@@ -3691,7 +3697,7 @@ RD_VIEW_UI_FUNCTION_DEF(color)
}
}
}
if(ui_dragging(h_sig) || ui_dragging(sv_sig))
if(ui_dragging(h_sig) || ui_dragging(sv_sig) || ui_dragging(a_sig))
{
// TODO(rjf): hard-coding U32 committing for now
E_Type *type = e_type_from_key__cached(e_type_key_unwrap(eval.irtree.type_key, E_TypeUnwrapFlag_AllDecorative));