Minor fixes

slonopotamus · Jul 30, 2024 · ea6215c · ea6215c
1 parent 6d7966f
commit ea6215c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/Source/EffectBox/Private/EffectBox.cpp b/Source/EffectBox/Private/EffectBox.cpp
@@ -13,12 +13,18 @@ UEffectBox::UEffectBox()
 
 TSharedRef<SWidget> UEffectBox::RebuildWidget()
 {
+	auto Content = SNullWidget::NullWidget;
+	if (const auto* ContentSlot = GetContentSlot())
+	{
+		if (ContentSlot->Content)
+		{
+			Content = ContentSlot->Content->TakeWidget();
+		}
+	}
+
 	MyEffectBox = SNew(SEffectBox)
 	                  .IsDesignTime(IsDesignTime())
-	                  .AllowFastUpdate(bAllowFastUpdate)
-	                      [GetContentSlot() && GetContentSlot()->Content
-	                           ? GetContentSlot()->Content->TakeWidget()
-	                           : SNullWidget::NullWidget];
+	                      [Content];
 
 	return MyEffectBox.ToSharedRef();
 }
@@ -56,6 +62,7 @@ void UEffectBox::SynchronizeProperties()
 		return;
 	}
 
+	MyEffectBox->SetAllowFastUpdate(bAllowFastUpdate);
 	MyEffectBox->SetEffectMaterial(EffectMaterial, TextureParameter);
 }
 

diff --git a/Source/EffectBox/Private/SEffectBox.cpp b/Source/EffectBox/Private/SEffectBox.cpp
@@ -92,6 +92,14 @@ UMaterialInstanceDynamic* SEffectBox::GetEffectMaterial() const
 	return DynamicEffect.Get();
 }
 
+void SEffectBox::SetAllowFastUpdate(bool bAllowFastUpdate)
+{
+	if (VirtualWindow)
+	{
+		VirtualWindow->SetAllowFastUpdate(bAllowFastUpdate);
+	}
+}
+
 int32 SEffectBox::OnPaint(const FPaintArgs& Args, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle, bool bParentEnabled) const
 {
 	SCOPE_CYCLE_SWIDGET(this);

diff --git a/Source/EffectBox/Public/SEffectBox.h b/Source/EffectBox/Public/SEffectBox.h
@@ -64,4 +64,6 @@ class EFFECTBOX_API SEffectBox final : public SCompoundWidget
 	void SetEffectMaterial(UMaterialInterface* EffectMaterial, const FName& TextureParameter);
 
 	UMaterialInstanceDynamic* GetEffectMaterial() const;
+
+	void SetAllowFastUpdate(bool bAllowFastUpdate);
 };