Merge branch '5.0'

Source/UINavigation/Private/UINavComponentBox.cpp

@@ -41,13 +41,13 @@ void UUINavComponentBox::BaseConstruct()
 void UUINavComponentBox::CheckLeftLimit()
 {
 	if (bLoopOptions) return;
-	if (OptionIndex == 0) LeftButton->SetIsEnabled(false);
+	if (OptionIndex <= 0) LeftButton->SetIsEnabled(false);
 }
 
 void UUINavComponentBox::CheckRightLimit()
 {
 	if (bLoopOptions) return;
-	if (OptionIndex == GetMaxOptionIndex()) RightButton->SetIsEnabled(false);
+	if (OptionIndex >= GetMaxOptionIndex()) RightButton->SetIsEnabled(false);
 }
 
 void UUINavComponentBox::UpdateTextToIndex(const int NewIndex)
@@ -102,7 +102,7 @@ void UUINavComponentBox::FinishNavigateLeft(const bool bOptionChanged)
 
 	CheckLeftLimit();
 	//Enable button if previously disabled
-	if (!RightButton->bIsEnabled) RightButton->SetIsEnabled(true);
+	if (!RightButton->bIsEnabled && GetMaxOptionIndex() > 0) RightButton->SetIsEnabled(true);
 
 	if (bOptionChanged)
 	{
@@ -130,7 +130,7 @@ void UUINavComponentBox::FinishNavigateRight(const bool bOptionChanged)
 
 	CheckRightLimit();
 	//Enable button if previously disabled
-	if (!LeftButton->bIsEnabled) LeftButton->SetIsEnabled(true);
+	if (!LeftButton->bIsEnabled && GetMaxOptionIndex() > 0) LeftButton->SetIsEnabled(true);
 
 	if (bOptionChanged)
 	{

Source/UINavigation/Private/UINavHorizontalComponent.cpp

@@ -23,7 +23,9 @@ void UUINavHorizontalComponent::NavigateRight()
 
 void UUINavHorizontalComponent::Update()
 {
-	int MaxOptionIndex = GetMaxOptionIndex();
+	const int MaxOptionIndex = GetMaxOptionIndex();
+	if (MaxOptionIndex < 1) return;
+
 	if (OptionIndex > MaxOptionIndex) OptionIndex = MaxOptionIndex;
 	else if (OptionIndex < 0) OptionIndex = 0;
 
@@ -36,9 +38,9 @@ void UUINavHorizontalComponent::UpdateTextToIndex(int NewIndex)
 	Update();
 }
 
-void UUINavHorizontalComponent::ChangeText(FText NewText)
+void UUINavHorizontalComponent::ChangeText(const FText NewText)
 {
-	NavText->SetText(NewText);
+	if (NavText != nullptr) NavText->SetText(NewText);
 }
 
 void UUINavHorizontalComponent::OnNavigateLeft_Implementation()

Source/UINavigation/Private/UINavOptionBox.cpp

@@ -24,12 +24,7 @@ int UUINavOptionBox::GetMaxOptionIndex() const
 	}
 	else
 	{
-		if (StringOptions.Num() > 0) return StringOptions.Num() - 1;
-		else
-		{
-			DISPLAYERROR(TEXT("StringOptions needs to have at least 2 options"));
-			return 0;
-		}
+		return StringOptions.Num() - 1;
 	}
 }
 
@@ -39,6 +34,6 @@ void UUINavOptionBox::Update()
 
 	NavText->SetText(bUseNumberRange ? 
 		FText::FromString(FString::FromInt(MinRange + OptionIndex*Interval)) : 
-		StringOptions.Num() > OptionIndex ? StringOptions[OptionIndex] : FText());
+		StringOptions.IsValidIndex(OptionIndex) ? StringOptions[OptionIndex] : FText());
 }
 

Source/UINavigation/Private/UINavPCComponent.cpp

@@ -49,6 +49,10 @@ void UUINavPCComponent::BeginPlay()
 
 		VerifyDefaultInputs();
 		FetchUINavActionKeys();
+		if (!FCoreDelegates::OnControllerConnectionChange.IsBoundToObject(this))
+		{
+			FCoreDelegates::OnControllerConnectionChange.AddUObject(this, &UUINavPCComponent::OnControllerConnectionChanged);
+		}
 	}
 }
 
@@ -58,6 +62,8 @@ void UUINavPCComponent::EndPlay(const EEndPlayReason::Type EndPlayReason)
 	{
 		FSlateApplication::Get().UnregisterInputPreProcessor(SharedInputProcessor);
 	}
+
+	FCoreDelegates::OnControllerConnectionChange.RemoveAll(this);
 
 	Super::EndPlay(EndPlayReason);
 }
@@ -203,6 +209,11 @@ void UUINavPCComponent::CallCustomInput(const FName ActionName, const bool bPres
 	}
 }
 
+void UUINavPCComponent::OnControllerConnectionChanged(bool bConnected, int32 UserId, int32 UserIndex)
+{
+	IUINavPCReceiver::Execute_OnControllerConnectionChanged(GetOwner(), bConnected, UserId, UserIndex);
+}
+
 void UUINavPCComponent::VerifyDefaultInputs()
 {
 	UUINavSettings *MySettings = GetMutableDefault<UUINavSettings>();

Source/UINavigation/Private/UINavPCReceiver.cpp

@@ -11,8 +11,11 @@ void IUINavPCReceiver::OnInputChanged_Implementation(EInputType From, EInputType
 {
 }
 
-void IUINavPCReceiver::OnActiveWidgetChanged_Implementation(UUINavWidget* OldActiveWidget,
-	UUINavWidget* NewActiveWidget)
+void IUINavPCReceiver::OnControllerConnectionChanged_Implementation(bool bConnected, int32 UserId, int32 UserIndex)
+{
+}
+
+void IUINavPCReceiver::OnActiveWidgetChanged_Implementation(UUINavWidget* OldActiveWidget, UUINavWidget* NewActiveWidget)
 {
 }
 

Source/UINavigation/Private/UINavSlider.cpp

@@ -67,7 +67,6 @@ void UUINavSlider::Update()
 	if (NavText != nullptr) NavText->SetText(ValueText);
 	if (NavSpinBox != nullptr)
 	{
-		bIgnoreSpinBoxCommit = true;
 		NavSpinBox->SetValue(Value);
 	}
 }
@@ -144,11 +143,6 @@ void UUINavSlider::HandleOnMouseCaptureEnd()
 
 void UUINavSlider::HandleOnSpinBoxValueChanged(float InValue, ETextCommit::Type CommitMethod)
 {
-	if (bIgnoreSpinBoxCommit)
-	{
-		bIgnoreSpinBoxCommit = false;
-		return;
-	}
 	OptionIndex = IndexFromValue(InValue);
 	Update();
 }

Source/UINavigation/Private/UINavWidget.cpp

@@ -11,6 +11,7 @@
 #include "UINavPCComponent.h"
 #include "UINavPCReceiver.h"
 #include "UINavPromptWidget.h"
+#include "UINavSettings.h"
 #include "UINavWidgetComponent.h"
 #include "UINavBlueprintFunctionLibrary.h"
 #include "UINavMacros.h"
@@ -134,8 +135,6 @@ void UUINavWidget::InitialSetup(const bool bRebuilding)
 	if (!IsSelectorValid())
 	{
 		UINavSetup();
-		bShouldTick = false;
-		return;
 	}
 	else
 	{
@@ -153,16 +152,12 @@ void UUINavWidget::ReconfigureSetup()
 	if (!IsSelectorValid())
 	{
 		UINavSetup();
-		return;
 	}
 	else
 	{
 		SetupSelector();
 	}
 
-	bShouldTick = true;
-	WaitForTick = 0;
-
 	for (UUINavWidget* ChildUINavWidget : ChildUINavWidgets)
 	{
 		ChildUINavWidget->ReconfigureSetup();
@@ -514,9 +509,7 @@ void UUINavWidget::RebuildNavigation(const int NewButtonIndex)
 	bMovingSelector = false;
 	bIgnoreMouseEvent = false;
 	bReturning = false;
-	bShouldTick = true;
 	ReceiveInputType = EReceiveInputType::None;
-	WaitForTick = 0;
 	HaltedIndex = -1;
 	SelectedButtonIndex = -1;
 	SelectCount = 0;
@@ -552,6 +545,9 @@ void UUINavWidget::SetupSelector()
 
 	SelectorSlot->SetAlignment(FVector2D(0.5f, 0.5f));
 	SelectorSlot->SetPosition(FVector2D(0.f, 0.f));
+
+	UINavSetupWaitForTick=0;
+	bShouldTickUINavSetup = true;
 }
 
 void UUINavWidget::UINavSetup()
@@ -574,7 +570,7 @@ void UUINavWidget::UINavSetup()
 	{
 		SetEnableUINavButtons(true, true);
 	}
-	
+
 	bCompletedSetup = true;
 
 	if (OuterUINavWidget == nullptr)
@@ -720,24 +716,41 @@ void UUINavWidget::NativeTick(const FGeometry & MyGeometry, float DeltaTime)
 {
 	Super::NativeTick(MyGeometry, DeltaTime);
 
-	if (!IsSelectorValid() || !bSetupStarted) return;
-
-	if (bMovingSelector)
-	{
-		HandleSelectorMovement(DeltaTime);
-	}
-	else
+	if (IsSelectorValid())
 	{
-		if (!bShouldTick) return;
-
-		if (WaitForTick == 1)
+		if (bShouldTickUINavSetup)
 		{
-			UINavSetup();
-			bShouldTick = false;
-			return;
+			if (UINavSetupWaitForTick >= 1)
+			{
+				UINavSetup();
+				bShouldTickUINavSetup = false;
+			}
+			else
+			{
+				UINavSetupWaitForTick++;
+			}
 		}
+		else
+		{
+			if (bShouldTickUpdateSelector)
+			{
+				if (UpdateSelectorWaitForTick >= 1)
+				{
+					if (MoveCurve != nullptr) BeginSelectorMovement(UpdateSelectorPrevButtonIndex, UpdateSelectorNextButtonIndex);
+					else UpdateSelectorLocation(UpdateSelectorNextButtonIndex);
+					bShouldTickUpdateSelector = false;
+				}
+				else
+				{
+					UpdateSelectorWaitForTick++;
+				}
+			}
 
-		WaitForTick++;
+			if (bMovingSelector)
+			{
+				HandleSelectorMovement(DeltaTime);
+			}
+		}
 	}
 }
 
@@ -1263,20 +1276,19 @@ void UUINavWidget::ReplaceButtonInNavigationGrid(UUINavButton * ButtonToReplace,
 
 void UUINavWidget::UpdateCurrentButton(UUINavButton * NewCurrentButton)
 {
-	ButtonIndex = NewCurrentButton->ButtonIndex;
 	if (IsSelectorValid())
 	{
-		if (MoveCurve != nullptr) BeginSelectorMovement(NewCurrentButton->ButtonIndex);
-		else UpdateSelectorLocation(NewCurrentButton->ButtonIndex);
+		UpdateSelectorWaitForTick = 0;
+		UpdateSelectorPrevButtonIndex = ButtonIndex;
+		UpdateSelectorNextButtonIndex = NewCurrentButton->ButtonIndex;
+		bShouldTickUpdateSelector = true;
 	}
 
+	ButtonIndex = NewCurrentButton->ButtonIndex;
+
 	for (UScrollBox* ScrollBox : ScrollBoxes)
 	{
-		if (NewCurrentButton->IsChildOf(ScrollBox))
-		{
 			ScrollBox->ScrollWidgetIntoView(NewCurrentButton, bAnimateScrollBoxes);
-			break;
-		}
 	}
 }
 
@@ -2410,8 +2422,10 @@ void UUINavWidget::DispatchNavigation(const int Index)
 
 	if (Index > -1 && IsSelectorValid())
 	{
-		if (MoveCurve != nullptr) BeginSelectorMovement(Index);
-		else UpdateSelectorLocation(Index);
+		UpdateSelectorWaitForTick = 0;
+		UpdateSelectorPrevButtonIndex = ButtonIndex;
+		UpdateSelectorNextButtonIndex = Index;
+		bShouldTickUpdateSelector = true;
 	}
 
 	if (bUseTextColor) UpdateTextColor(Index);
@@ -2424,12 +2438,12 @@ void UUINavWidget::DispatchNavigation(const int Index)
 	if (UINavAnimations.Num() > 0) ExecuteAnimations(ButtonIndex, Index);
 }
 
-void UUINavWidget::BeginSelectorMovement(const int Index)
+void UUINavWidget::BeginSelectorMovement(const int PrevButtonIndex, const int NextButtonIndex)
 {
 	if (MoveCurve == nullptr) return;
 
-	SelectorOrigin = bMovingSelector ? TheSelector->RenderTransform.Translation : GetButtonLocation(ButtonIndex);
-	SelectorDestination = GetButtonLocation(Index);
+	SelectorOrigin = bMovingSelector ? TheSelector->RenderTransform.Translation : GetButtonLocation(PrevButtonIndex);
+	SelectorDestination = GetButtonLocation(NextButtonIndex);
 	Distance = SelectorDestination - SelectorOrigin;
 
 	float MinTime, MaxTime;

Source/UINavigation/Public/UINavButton.h

@@ -59,7 +59,7 @@ class UINAVIGATION_API UUINavButton : public UButton
 	UPROPERTY(BlueprintReadOnly, Category = UINavButton)
 		int IndexInGrid = - 1;
 
-	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = UINavButton)
+	UPROPERTY(BlueprintReadOnly, Category = UINavButton)
 		UUINavComponent* NavComp = nullptr;
 
 	EButtonStyle CurrentStyle = EButtonStyle::Normal;

Source/UINavigation/Public/UINavHorizontalComponent.h

@@ -35,7 +35,7 @@ class UINAVIGATION_API UUINavHorizontalComponent : public UUINavComponent
 		virtual void UpdateTextToIndex(int NewIndex);
 	//Changes the text displayed in the NavText element
 	UFUNCTION(BlueprintCallable, Category = UINavComponentBox)
-		void ChangeText(FText NewText);
+		void ChangeText(const FText NewText);
 
 	UFUNCTION(BlueprintCallable, Category = UINavComponentBox)
 		virtual FORCEINLINE int GetMaxOptionIndex() const { return 0; }

Source/UINavigation/Public/UINavOptionBox.h

@@ -33,6 +33,6 @@ class UINAVIGATION_API UUINavOptionBox : public UUINavComponentBox
 		TArray<FText> StringOptions;
 
 	UFUNCTION(BlueprintCallable, BlueprintPure, Category = UINavOptionBox)
-		FORCEINLINE FText GetCurrentString() const { return StringOptions[OptionIndex]; }
+		FORCEINLINE FText GetCurrentString() const { return StringOptions.IsValidIndex(OptionIndex) ? StringOptions[OptionIndex] : FText(); }
 
 };

Source/UINavigation/Public/UINavPCComponent.h

@@ -124,6 +124,8 @@ class UINAVIGATION_API UUINavPCComponent : public UActorComponent
 
 	void CallCustomInput(const FName ActionName, const bool bPressed);
 
+	UFUNCTION()
+	void OnControllerConnectionChanged(bool bConnected, int32 UserId, int32 UserIndex);
 
 public:
 

Source/UINavigation/Public/UINavPCReceiver.h

@@ -41,6 +41,13 @@ class UINAVIGATION_API IUINavPCReceiver
 		void OnInputChanged(EInputType From, EInputType To);
 	virtual void OnInputChanged_Implementation(EInputType From, EInputType To);
 
+	/**
+	*	Called when a controller is connected and disconnected
+	*/
+	UFUNCTION(BlueprintNativeEvent, Category = UINavController)
+		void OnControllerConnectionChanged(bool bConnected, int32 UserId, int32 UserIndex);
+	virtual void OnControllerConnectionChanged_Implementation(bool bConnected, int32 UserId, int32 UserIndex);
+
 	/**
 	*	Called when the active widget changes
 	*

Source/UINavigation/Public/UINavSlider.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 Gonçalo Marques - All Rights Reserved
+// Copyright (C) 2019 Gonçalo Marques - All Rights Reserved
 
 #pragma once
 
@@ -21,8 +21,6 @@ class UINAVIGATION_API UUINavSlider : public UUINavHorizontalComponent
 	UPROPERTY(BlueprintReadWrite, Category = UINavSlider, meta = (BindWidget, OptionalWidget = true))
 		class USpinBox* NavSpinBox;
 
-	bool bIgnoreSpinBoxCommit = false;
-
 	UFUNCTION()
 		void HandleOnSliderValueChanged(const float InValue);
 	UFUNCTION()