Merge branch 'master' of github.com:sinbad/StevesUEHelpers

This commit is contained in:
Steve Streeting 2020-10-27 10:17:56 +00:00
commit 4515692e71
2 changed files with 13 additions and 2 deletions

View File

@ -16,7 +16,6 @@ void UOptionWidgetBase::NativeConstruct()
{
GS->OnInputModeChanged.AddDynamic(this, &UOptionWidgetBase::InputModeChanged);
UpdateFromInputMode(GS->GetLastInputModeUsed());
ClearOptions();
}
else
UE_LOG(LogStevesUI, Error, TEXT("StevesGameSubsystem is missing!"));
@ -44,6 +43,10 @@ void UOptionWidgetBase::NativeConstruct()
UE_LOG(LogStevesUI, Error, TEXT("%s should have a GamepadDownImage instance."), *this->GetClass()->GetName());
SynchronizeProperties();
// To support option set up in designer
SetSelectedIndex(SelectedIndex);
}
@ -166,6 +169,9 @@ void UOptionWidgetBase::SetMouseMode()
}
MouseVersion->SetVisibility(ESlateVisibility::Visible);
SynchronizeProperties();
if (bHadFocus)
SetFocusProperly();
@ -181,6 +187,9 @@ void UOptionWidgetBase::SetButtonMode()
MouseVersion->SetVisibility(ESlateVisibility::Hidden);
GamepadVersion->SetVisibility(ESlateVisibility::Visible);
SynchronizeProperties();
if (bHadFocus)
SetFocusProperly();

View File

@ -118,7 +118,9 @@ public:
protected:
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category=Content)
TArray<FText> Options;
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category=Content)
int SelectedIndex;
virtual void SyncButtonProperties(UButton* Button) const;