ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-06-13 07:32:23 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/EpicGames/raddebugger into dev

Browse Source
This commit is contained in:
Ryan Fleury
2024-01-13 08:31:08 -08:00
parent f9ab53c0c4 d382053500
commit e30c6553a4
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/df/gfx/df_gfx.c
+11 -11
View File
@@ -1842,8 +1842,18 @@ df_window_update_and_render(Arena *arena, OS_EventList *events, DF_Window *ws, D
keep_child->size_pct_of_parent.v[split_axis] *= size_pct_of_parent.v[split_axis];
keep_child->size_pct_of_parent.v[axis2_flip(split_axis)] *= size_pct_of_parent.v[axis2_flip(split_axis)];
// rjf: reset focus, if needed
if(ws->focused_panel == discard_child)
{
ws->focused_panel = keep_child;
for(DF_Panel *grandchild = ws->focused_panel; !df_panel_is_nil(grandchild); grandchild = grandchild->first)
{
ws->focused_panel = grandchild;
}
}
// rjf: keep-child split-axis == grandparent split-axis? bubble keep-child up into grandparent's children
if(grandparent->split_axis == keep_child->split_axis && !df_panel_is_nil(keep_child->first))
if(!df_panel_is_nil(grandparent) && grandparent->split_axis == keep_child->split_axis && !df_panel_is_nil(keep_child->first))
{
df_panel_remove(grandparent, keep_child);
DF_Panel *prev = parent_prev;
@@ -1858,16 +1868,6 @@ df_window_update_and_render(Arena *arena, OS_EventList *events, DF_Window *ws, D
}
df_panel_release(ws, keep_child);
}
// rjf: reset focus, if needed
if(ws->focused_panel == discard_child)
{
ws->focused_panel = keep_child;
for(DF_Panel *grandchild = ws->focused_panel; !df_panel_is_nil(grandchild); grandchild = grandchild->first)
{
ws->focused_panel = grandchild;
}
}
}
// NOTE(rjf): Otherwise we can just remove this child.
else