Merge branch '5.4' into 5.5_dev

Author: pavlicekdominik

Source/MounteaDialogueSystem/Private/WBP/MounteaDialogueOption.cpp

@@ -52,8 +52,15 @@ void UMounteaDialogueOption::InitializeDialogueOption_Implementation()
 	// ...
 }
 
+void UMounteaDialogueOption::EnableFocus_Implementation(const bool bIsWidgetEnabled)
+{
+	SetIsFocusable(bIsWidgetEnabled) ;
+}
+
 void UMounteaDialogueOption::SetFocusState_Implementation(const bool IsSelected)
 {
+	if (!IsFocusable()) return;
+	
 	DialogueOptionState = IsSelected ? EDialogueOptionState::EDOS_Focused : EDialogueOptionState::EDOS_Unfocused;
 
 	OnOptionFocusChanged.Broadcast(this, IsSelected);

Source/MounteaDialogueSystem/Private/WBP/MounteaDialogueOptionsContainer.cpp

@@ -36,11 +36,9 @@ void UMounteaDialogueOptionsContainer::NativeTick(const FGeometry& MyGeometry, f
 				focusableWidget = dialogueOptions[LastFocusedOption];
 			else
 				focusableWidget = nullptr;
-
-			if (focusableWidget != nullptr)
-			{
+			
+			if (focusableWidget != nullptr && IMounteaFocusableWidgetInterface::Execute_IsFocusEnabled(focusableWidget))
 				IMounteaFocusableWidgetInterface::Execute_SetFocusState(focusableWidget, true);
-			}
 		}
 	}
 }

Source/MounteaDialogueSystem/Public/Interfaces/UMG/MounteaFocusableWidgetInterface.h

@@ -32,6 +32,14 @@ class MOUNTEADIALOGUESYSTEM_API IMounteaFocusableWidgetInterface
 	GENERATED_BODY()
 
 public:
+
+	UFUNCTION(BlueprintNativeEvent, Category="Mountea|Dialogue|UserInterface|Focus")
+	bool IsFocusEnabled() const;
+	virtual bool IsFocusEnabled_Implementation() const = 0;
+
+	UFUNCTION(BlueprintNativeEvent, Category="Mountea|Dialogue|UserInterface|Focus")
+	void EnableFocus(const bool bIsWidgetEnabled = true);
+	virtual void EnableFocus_Implementation(const bool bIsWidgetEnabled = true) = 0;
 
 	UFUNCTION(BlueprintNativeEvent, Category="Mountea|Dialogue|UserInterface|Focus")
 	EDialogueOptionState GetFocusState() const;

Source/MounteaDialogueSystem/Public/WBP/MounteaDialogueOption.h

@@ -44,6 +44,10 @@ class MOUNTEADIALOGUESYSTEM_API UMounteaDialogueOption : public UUserWidget, pub
 
 public:
 
+	virtual bool IsFocusEnabled_Implementation() const override
+	{return IsFocusable(); };
+	virtual void EnableFocus_Implementation(const bool bIsWidgetEnabled = true) override;
+
 	virtual EDialogueOptionState GetFocusState_Implementation() const override
 	{ return DialogueOptionState; };
 	virtual void SetFocusState_Implementation(const bool IsSelected) override;