Fixed gui_push_parent and gui_pop_parent using wrong subtree

2 years ago · 44d375af29
1 changed files with 4 additions and 2 deletions
--- a/gui/gui.c
+++ b/gui/gui.c
@ -732,7 +732,8 @@ void gui_push_parent(
 {
 	GUI_Layer *current_layer = context->current_layer;
 	GUI_Subtree *current_subtree =
-		(GUI_Subtree*)current_layer->subtree_rdic.frame_current_node;
+		//(GUI_Subtree*)current_layer->subtree_rdic.frame_current_node;
+		(GUI_Subtree*)current_layer->subtree_rdic.current_parent;
 	rdic_push_parent(&current_subtree->rdic, parent.rdic_ref);
 }

@ -741,7 +742,8 @@ void gui_pop_parent(
 {
 	GUI_Layer *current_layer = context->current_layer;
 	GUI_Subtree *current_subtree =
-		(GUI_Subtree*)current_layer->subtree_rdic.frame_current_node;
+		//(GUI_Subtree*)current_layer->subtree_rdic.frame_current_node;
+		(GUI_Subtree*)current_layer->subtree_rdic.current_parent;
 	rdic_pop_parent(&current_subtree->rdic);
 }