Fixed gui_push_parent and gui_pop_parent using wrong subtree
This commit is contained in:
1 parent
861e774dee
commit
44d375af29
1 file changed
+4
-2
@@ -732,7 +732,8 @@ void gui_push_parent(
|
|||||||
{
|
{
|
||||||
GUI_Layer *current_layer = context->current_layer;
|
GUI_Layer *current_layer = context->current_layer;
|
||||||
GUI_Subtree *current_subtree =
|
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(¤t_subtree->rdic, parent.rdic_ref);
|
rdic_push_parent(¤t_subtree->rdic, parent.rdic_ref);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -741,7 +742,8 @@ void gui_pop_parent(
|
|||||||
{
|
{
|
||||||
GUI_Layer *current_layer = context->current_layer;
|
GUI_Layer *current_layer = context->current_layer;
|
||||||
GUI_Subtree *current_subtree =
|
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(¤t_subtree->rdic);
|
rdic_pop_parent(¤t_subtree->rdic);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user