diff --git a/Source/vampires/Widgets/SelectWeaponWidget.cpp b/Source/vampires/Widgets/SelectWeaponWidget.cpp index d133fd0..0b7aeb2 100644 --- a/Source/vampires/Widgets/SelectWeaponWidget.cpp +++ b/Source/vampires/Widgets/SelectWeaponWidget.cpp @@ -17,13 +17,8 @@ void USelectWeaponWidget::NativeConstruct() if (BackButton) { BackButton->OnClicked.AddUniqueDynamic(this, &USelectWeaponWidget::BackButtonClicked); - BackButton->OnClicked.AddUniqueDynamic(this, &USelectWeaponWidget::PlayClickedSound); - - BackButton->OnHovered.AddUniqueDynamic(this, &USelectWeaponWidget::PlayHoveredSound); - BackButton->OnHovered.AddUniqueDynamic(this, &USelectWeaponWidget::BackButtonTextBlockHoveredDelegate); - - BackButton->OnUnhovered.AddUniqueDynamic(this, &USelectWeaponWidget::BackButtonTextBlockUnhoveredDelegate); - BackButton->OnUnhovered.AddUniqueDynamic(this, &USelectWeaponWidget::PlayUnhoveredSound); + BackButton->OnHovered.AddUniqueDynamic(this, &USelectWeaponWidget::BackButtonOnHovered); + BackButton->OnUnhovered.AddUniqueDynamic(this, &USelectWeaponWidget::BackButtonOnUnhovered); } if (UpgradesListView) @@ -40,6 +35,7 @@ void USelectWeaponWidget::NativeConstruct() void USelectWeaponWidget::BackButtonClicked() { + PlayClickedSound(); if (PreviousWidget) { RemoveFromParent(); @@ -53,3 +49,15 @@ void USelectWeaponWidget::BackButtonClicked() } } } + +void USelectWeaponWidget::BackButtonOnHovered() +{ + PlayHoveredSound(); + SetTextBlockHovered(BackTextBlock); +} + +void USelectWeaponWidget::BackButtonOnUnhovered() +{ + PlayUnhoveredSound(); + SetTextBlockUnhovered(BackTextBlock); +} diff --git a/Source/vampires/Widgets/SelectWeaponWidget.h b/Source/vampires/Widgets/SelectWeaponWidget.h index a7a14df..7d5434e 100644 --- a/Source/vampires/Widgets/SelectWeaponWidget.h +++ b/Source/vampires/Widgets/SelectWeaponWidget.h @@ -17,16 +17,17 @@ UCLASS() class VAMPIRES_API USelectWeaponWidget : public UVampireInteractiveWidget { GENERATED_BODY() -protected: - UPROPERTY(BlueprintReadWrite, meta=(BindWidget)) + UPROPERTY(meta=(BindWidget)) TObjectPtr BackButton; - UPROPERTY(BlueprintReadWrite, meta=(BindWidget)) + UPROPERTY(meta=(BindWidget)) TObjectPtr BackTextBlock; - UPROPERTY(BlueprintReadWrite, meta=(BindWidget)) + UPROPERTY(meta=(BindWidget)) TObjectPtr UpgradesListView; + +protected: UPROPERTY(EditDefaultsOnly) TArray> StarterWeapons; @@ -42,8 +43,8 @@ private: void BackButtonClicked(); UFUNCTION() - void BackButtonTextBlockHoveredDelegate() { SetTextBlockHovered(BackTextBlock); } + void BackButtonOnHovered(); UFUNCTION() - void BackButtonTextBlockUnhoveredDelegate() { SetTextBlockUnhovered(BackTextBlock); } + void BackButtonOnUnhovered(); };