[[ Bug 23098 ]] Fix native layers not relayering after object relayer

montegoulding · montegoulding · commit 1b8c9dc44391 · 2021-02-24T16:16:25.000+11:00
This patch fixes an issue where native layers do not relayer after the relayer
command should change the native layer hierarchy.
diff --git a/docs/notes/bugfix-23098.md b/docs/notes/bugfix-23098.md
@@ -0,0 +1 @@
+# Native layers now relayer correctly in response to the relayer command
diff --git a/engine/src/card.cpp b/engine/src/card.cpp
@@ -1633,6 +1633,8 @@ void MCCard::relayercontrol(MCControl *p_source, MCControl *p_target)
 	else
 		t_source_ptr -> appendto(objptrs);
 	layer_added(p_source, MCControlPreviousByLayer(p_source), MCControlNextByLayer(p_source));
+
+	p_source->layerchanged();
 }
 
 void MCCard::relayercontrol_remove(MCControl *p_control)
@@ -1688,6 +1690,8 @@ void MCCard::relayercontrol_insert(MCControl *p_control, MCControl *p_target)
 	else
 		t_control_ptr -> appendto(objptrs);
 	layer_added(p_control, MCControlPreviousByLayer(p_control), MCControlNextByLayer(p_control));
+
+	p_control->layerchanged();
 }
 
 Exec_stat MCCard::relayer(MCControl *optr, uint2 newlayer)
diff --git a/engine/src/group.cpp b/engine/src/group.cpp
@@ -3069,6 +3069,8 @@ void MCGroup::relayercontrol(MCControl *p_source, MCControl *p_target)
 
 	if (!computeminrect(False))
 		p_source -> layer_redrawall();
+
+	p_source->layerchanged();
 }
 
 void MCGroup::relayercontrol_remove(MCControl *p_control)
@@ -3096,6 +3098,8 @@ void MCGroup::relayercontrol_insert(MCControl *p_control, MCControl *p_target)
 
 	if (!computeminrect(False))
 		p_control -> layer_redrawall();
+
+	p_control->layerchanged();
 }
 
 bool MCGroup::getNativeContainerLayer(MCNativeLayer *&r_layer)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Native layers now relayer correctly in response to the relayer command`
Original file line number	Diff line number	Diff line change
`@@ -3069,6 +3069,8 @@ void MCGroup::relayercontrol(MCControl p_source, MCControl p_target)`
`3069`	`3069`
`3070`	`3070`	`if (!computeminrect(False))`
`3071`	`3071`	`p_source -> layer_redrawall();`
	`3072`	`+`
	`3073`	`+ p_source->layerchanged();`
`3072`	`3074`	`}`
`3073`	`3075`
`3074`	`3076`	`void MCGroup::relayercontrol_remove(MCControl *p_control)`
`@@ -3096,6 +3098,8 @@ void MCGroup::relayercontrol_insert(MCControl p_control, MCControl p_target)`
`3096`	`3098`
`3097`	`3099`	`if (!computeminrect(False))`
`3098`	`3100`	`p_control -> layer_redrawall();`
	`3101`	`+`
	`3102`	`+ p_control->layerchanged();`
`3099`	`3103`	`}`
`3100`	`3104`
`3101`	`3105`	`bool MCGroup::getNativeContainerLayer(MCNativeLayer *&r_layer)`