Lots of little UI adjustments

Source/vampires/Widgets/SelectWeaponWidget.cpp

@@ -17,6 +17,13 @@ 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);
 	}
 
 	if (UpgradesListView)

Source/vampires/Widgets/SelectWeaponWidget.h

@@ -20,10 +20,13 @@ class VAMPIRES_API USelectWeaponWidget : public UVampireInteractiveWidget
 public:
 
 	UPROPERTY(BlueprintReadWrite, meta=(BindWidget))
-	UButton* BackButton;
+	TObjectPtr<UButton> BackButton;
 
 	UPROPERTY(BlueprintReadWrite, meta=(BindWidget))
-	UListView* UpgradesListView;
+	TObjectPtr<UTextBlock> BackTextBlock;
+
+	UPROPERTY(BlueprintReadWrite, meta=(BindWidget))
+	TObjectPtr<UListView> UpgradesListView;
 	
 	UPROPERTY(EditDefaultsOnly)
 	TArray<TSubclassOf<AWeapon>> starterWeapons;
@@ -38,4 +41,9 @@ private:
 	UFUNCTION()
 	void BackButtonClicked();
 
+	UFUNCTION()
+	void BackButtonTextBlockHoveredDelegate() { SetTextBlockHovered(BackTextBlock); }
+
+	UFUNCTION()
+	void BackButtonTextBlockUnhoveredDelegate() { SetTextBlockUnhovered(BackTextBlock); }
 };

Source/vampires/Widgets/StarterWeaponButtonWidget.cpp

@@ -31,6 +31,12 @@ void UStarterWeaponButtonWidget::NativeOnListItemObjectSet(UObject* ListItemObje
 		if (Body)
 		{
 			Body->OnClicked.AddUniqueDynamic(this, &UStarterWeaponButtonWidget::OnClicked);
+
+			Body->OnHovered.AddUniqueDynamic(this, &UStarterWeaponButtonWidget::PlayHoveredSound);
+			Body->OnHovered.AddUniqueDynamic(this, &UStarterWeaponButtonWidget::OnHoveredDelegate);
+
+			Body->OnUnhovered.AddUniqueDynamic(this, &UStarterWeaponButtonWidget::OnUnhoveredDelegate);
+			Body->OnUnhovered.AddUniqueDynamic(this, &UStarterWeaponButtonWidget::PlayUnhoveredSound);
 		}
 	}
 }

Source/vampires/Widgets/StarterWeaponButtonWidget.h

@@ -3,6 +3,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "VampireInteractiveWidget.h"
 #include "Blueprint/IUserObjectListEntry.h"
 #include "Blueprint/UserWidget.h"
 #include "StarterWeaponButtonWidget.generated.h"
@@ -15,7 +16,7 @@ class UButton;
  * 
  */
 UCLASS()
-class VAMPIRES_API UStarterWeaponButtonWidget : public UUserWidget, public IUserObjectListEntry
+class VAMPIRES_API UStarterWeaponButtonWidget : public UVampireInteractiveWidget, public IUserObjectListEntry
 {
 	GENERATED_BODY()
 
@@ -46,4 +47,11 @@ protected:
 private:
 	UFUNCTION()
 	virtual void OnClicked();
+
+	UFUNCTION()
+	void OnHoveredDelegate() { SetTextBlockHovered(WeaponNameTextBlock); SetTextBlockHovered(DescriptionTextBlock); }
+
+	UFUNCTION()
+	void OnUnhoveredDelegate() { SetTextBlockUnhovered(WeaponNameTextBlock); SetTextBlockUnhovered(DescriptionTextBlock); }
+	
 };

Source/vampires/Widgets/UpgradeButtonWidget.cpp

@@ -53,6 +53,12 @@ void UUpgradeButtonWidget::NativeOnListItemObjectSet(UObject* ListItemObject)
 		if (Body)
 		{
 			Body->OnClicked.AddUniqueDynamic(this, &UUpgradeButtonWidget::OnClicked);
+
+			Body->OnHovered.AddUniqueDynamic(this, &UUpgradeButtonWidget::PlayHoveredSound);
+			Body->OnHovered.AddUniqueDynamic(this, &UUpgradeButtonWidget::OnHoveredDelegate);
+
+			Body->OnUnhovered.AddUniqueDynamic(this, &UUpgradeButtonWidget::OnUnhoveredDelegate);
+			Body->OnUnhovered.AddUniqueDynamic(this, &UUpgradeButtonWidget::PlayUnhoveredSound);
 		}
 	}
 

Source/vampires/Widgets/UpgradeButtonWidget.h

@@ -3,6 +3,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "VampireInteractiveWidget.h"
 #include "Blueprint/IUserObjectListEntry.h"
 #include "Blueprint/UserWidget.h"
 #include "UpgradeButtonWidget.generated.h"
@@ -26,7 +27,7 @@ class UButton;
  * 
  */
 UCLASS()
-class VAMPIRES_API UUpgradeButtonWidget : public UUserWidget, public IUserObjectListEntry
+class VAMPIRES_API UUpgradeButtonWidget : public UVampireInteractiveWidget, public IUserObjectListEntry
 {
 	GENERATED_BODY()
 
@@ -79,4 +80,11 @@ protected:
 private:
 	UFUNCTION()
 	virtual void OnClicked();
+	
+	UFUNCTION()
+	void OnHoveredDelegate() { SetTextBlockHovered(WeaponNameTextBlock); SetTextBlockHovered(DescriptionTextBlock); }
+
+	UFUNCTION()
+	void OnUnhoveredDelegate() { SetTextBlockUnhovered(WeaponNameTextBlock); SetTextBlockUnhovered(DescriptionTextBlock); }
+	
 };