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

fix possible incorrect panel being used in commands fired from tab right-click menu

Browse Source
This commit is contained in:
Ryan Fleury
2024-06-27 14:24:45 -07:00
parent 13aa41910e
commit 8ca67ff892
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/df/gfx/df_gfx.c
+3 -5
View File
@@ -4444,6 +4444,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, DF_CmdList *cmds)
UI_CtxMenu(ws->tab_ctx_menu_key) UI_PrefWidth(ui_em(25.f, 1.f)) UI_CornerRadius(0) UI_CtxMenu(ws->tab_ctx_menu_key) UI_PrefWidth(ui_em(25.f, 1.f)) UI_CornerRadius(0)
DF_Palette(DF_PaletteCode_ImplicitButton) DF_Palette(DF_PaletteCode_ImplicitButton)
{ {
DF_Panel *panel = df_panel_from_handle(ws->tab_ctx_menu_panel);
DF_View *view = df_view_from_handle(ws->tab_ctx_menu_view); DF_View *view = df_view_from_handle(ws->tab_ctx_menu_view);
DF_IconKind view_icon = df_icon_kind_from_view(view); DF_IconKind view_icon = df_icon_kind_from_view(view);
DF_Entity *entity = df_entity_from_handle(view->entity); DF_Entity *entity = df_entity_from_handle(view->entity);
@@ -4530,11 +4531,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, DF_CmdList *cmds)
// rjf: close tab // rjf: close tab
if(ui_clicked(df_icon_buttonf(DF_IconKind_X, 0, "Close Tab"))) if(ui_clicked(df_icon_buttonf(DF_IconKind_X, 0, "Close Tab")))
{ {
DF_CmdParams params = df_cmd_params_from_window(ws); DF_CmdParams params = df_cmd_params_from_view(ws, panel, view);
{
params.view = df_handle_from_view(view);
df_cmd_params_mark_slot(&params, DF_CmdParamSlot_View);
}
df_push_cmd__root(&params, df_cmd_spec_from_core_cmd_kind(DF_CoreCmdKind_CloseTab)); df_push_cmd__root(&params, df_cmd_spec_from_core_cmd_kind(DF_CoreCmdKind_CloseTab));
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
@@ -7465,6 +7462,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, DF_CmdList *cmds)
else if(ui_right_clicked(sig)) else if(ui_right_clicked(sig))
{ {
ui_ctx_menu_open(ws->tab_ctx_menu_key, sig.box->key, v2f32(0, sig.box->rect.y1 - sig.box->rect.y0)); ui_ctx_menu_open(ws->tab_ctx_menu_key, sig.box->key, v2f32(0, sig.box->rect.y1 - sig.box->rect.y0));
ws->tab_ctx_menu_panel = df_handle_from_panel(panel);
ws->tab_ctx_menu_view = df_handle_from_view(view); ws->tab_ctx_menu_view = df_handle_from_view(view);
} }
else if(ui_middle_clicked(sig)) else if(ui_middle_clicked(sig))
src/df/gfx/df_gfx.h
+1
View File
@@ -591,6 +591,7 @@ struct DF_Window
// rjf: tab context menu state // rjf: tab context menu state
UI_Key tab_ctx_menu_key; UI_Key tab_ctx_menu_key;
DF_Handle tab_ctx_menu_panel;
DF_Handle tab_ctx_menu_view; DF_Handle tab_ctx_menu_view;
// rjf: autocomplete lister state // rjf: autocomplete lister state