Просмотр исходного кода

Apply transform during Element's exit effect, see #886

Michael Ragazzon 1 день назад
Родитель
Сommit
a5ceb26e57
1 измененных файлов с 1 добавлено и 6 удалено
  1. 1 6
      Source/Core/Element.cpp

+ 1 - 6
Source/Core/Element.cpp

@@ -181,18 +181,14 @@ void Element::Render()
 
 
 	UpdateAbsoluteOffsetAndRenderBoxData();
 	UpdateAbsoluteOffsetAndRenderBoxData();
 
 
-	// Rebuild our stacking context if necessary.
 	if (stacking_context_dirty)
 	if (stacking_context_dirty)
 		BuildLocalStackingContext();
 		BuildLocalStackingContext();
 
 
 	UpdateTransformState();
 	UpdateTransformState();
-
-	// Apply our transform
 	ElementUtilities::ApplyTransform(*this);
 	ElementUtilities::ApplyTransform(*this);
 
 
 	meta->effects.RenderEffects(RenderStage::Enter);
 	meta->effects.RenderEffects(RenderStage::Enter);
 
 
-	// Set up the clipping region for this element.
 	if (ElementUtilities::SetClippingRegion(this))
 	if (ElementUtilities::SetClippingRegion(this))
 	{
 	{
 		meta->background_border.Render(this);
 		meta->background_border.Render(this);
@@ -200,15 +196,14 @@ void Element::Render()
 
 
 		{
 		{
 			RMLUI_ZoneScopedNC("OnRender", 0x228B22);
 			RMLUI_ZoneScopedNC("OnRender", 0x228B22);
-
 			OnRender();
 			OnRender();
 		}
 		}
 	}
 	}
 
 
-	// Render all elements in our local stacking context.
 	for (Element* element : stacking_context)
 	for (Element* element : stacking_context)
 		element->Render();
 		element->Render();
 
 
+	ElementUtilities::ApplyTransform(*this);
 	meta->effects.RenderEffects(RenderStage::Exit);
 	meta->effects.RenderEffects(RenderStage::Exit);
 }
 }