ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-08-06 22:08:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow fall-through clicks on context menus; fix busted context menu sizing in theme color popup

Browse Source
This commit is contained in:
Ryan Fleury
2024-01-11 11:05:02 -08:00
parent c8723613df
commit dd43fd2564
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/df/gfx/df_views.c
+2 -1
View File
@@ -8596,7 +8596,8 @@ DF_VIEW_UI_FUNCTION_DEF(Theme)
color < DF_ThemeColor_COUNT; color < DF_ThemeColor_COUNT;
color = (DF_ThemeColor)(color+1)) color = (DF_ThemeColor)(color+1))
{ {
UI_PrefWidth(ui_em(28.5f, 1)) UI_PrefHeight(ui_children_sum(1.f)) UI_CtxMenu(color_ctx_menu_keys[color]) UI_Padding(ui_em(1.5f, 1.f)) UI_CtxMenu(color_ctx_menu_keys[color]) UI_Padding(ui_em(1.5f, 1.f))
UI_PrefWidth(ui_em(28.5f, 1)) UI_PrefHeight(ui_children_sum(1.f))
{ {
// rjf: build title // rjf: build title
UI_Row UI_Row
src/ui/ui_core.c
+18 -12
View File
@@ -903,7 +903,7 @@ ui_begin_build(OS_EventList *events, OS_Handle window, UI_NavActionList *nav_act
UI_FixedX(anchor.x) UI_FixedY(anchor.y) UI_PrefWidth(ui_children_sum(1.f)) UI_PrefHeight(ui_children_sum(1.f)) UI_Focus(ui_state->ctx_menu_open) UI_FixedX(anchor.x) UI_FixedY(anchor.y) UI_PrefWidth(ui_children_sum(1.f)) UI_PrefHeight(ui_children_sum(1.f)) UI_Focus(ui_state->ctx_menu_open)
{ {
ui_set_next_child_layout_axis(Axis2_Y); ui_set_next_child_layout_axis(Axis2_Y);
ui_state->ctx_menu_root = ui_build_box_from_stringf(UI_BoxFlag_DrawDropShadow|(ui_state->ctx_menu_open*UI_BoxFlag_DefaultFocusNavY), "###ctx_menu_%I64x", window.u64[0]); ui_state->ctx_menu_root = ui_build_box_from_stringf(UI_BoxFlag_Clickable|UI_BoxFlag_DrawDropShadow|(ui_state->ctx_menu_open*UI_BoxFlag_DefaultFocusNavY), "###ctx_menu_%I64x", window.u64[0]);
} }
} }
@@ -1015,16 +1015,6 @@ ui_end_build(void)
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
//- rjf: close ctx menu if unconsumed clicks
for(OS_Event *event = ui_events()->first; event != 0; event = event->next)
{
if(event->kind == OS_EventKind_Press && os_handle_match(event->window, ui_window()) &&
(event->key == OS_Key_LeftMouseButton || event->key == OS_Key_RightMouseButton))
{
ui_ctx_menu_close();
}
}
//- rjf: stick ctx menu to anchor //- rjf: stick ctx menu to anchor
if(ui_state->ctx_menu_touched_this_frame) if(ui_state->ctx_menu_touched_this_frame)
{ {
@@ -1214,6 +1204,22 @@ ui_end_build(void)
root->rect.y1 = root->rect.y0 + dim_2f32(rect).y * ui_state->ctx_menu_open_t; root->rect.y1 = root->rect.y0 + dim_2f32(rect).y * ui_state->ctx_menu_open_t;
} }
//- rjf: fall-through interact with context menu
if(ui_state->ctx_menu_open)
{
ui_signal_from_box(ui_state->ctx_menu_root);
}
//- rjf: close ctx menu if unconsumed clicks
for(OS_Event *event = ui_events()->first; event != 0; event = event->next)
{
if(event->kind == OS_EventKind_Press && os_handle_match(event->window, ui_window()) &&
(event->key == OS_Key_LeftMouseButton || event->key == OS_Key_RightMouseButton))
{
ui_ctx_menu_close();
}
}
//- rjf: hover cursor //- rjf: hover cursor
{ {
UI_Box *hot = ui_box_from_key(ui_state->hot_box_key); UI_Box *hot = ui_box_from_key(ui_state->hot_box_key);
@@ -2304,7 +2310,7 @@ ui_signal_from_box(UI_Box *box)
B32 ctx_menu_is_ancestor = 0; B32 ctx_menu_is_ancestor = 0;
ProfScope("check context menu ancestor") ProfScope("check context menu ancestor")
{ {
for(UI_Box *parent = box->parent; !ui_box_is_nil(parent); parent = parent->parent) for(UI_Box *parent = box; !ui_box_is_nil(parent); parent = parent->parent)
{ {
if(parent == ui_state->ctx_menu_root) if(parent == ui_state->ctx_menu_root)
{ {