Improved modifier layout

PipeRift · Oct 21, 2019 · 74313a9 · 74313a9
1 parent 92fbf52
commit 74313a9
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 35 deletions.
diff --git a/AttributesExtension.uplugin b/AttributesExtension.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
-	"Version": 3,
-	"VersionName": "1.3",
+	"Version": 4,
+	"VersionName": "1.3a",
 	"FriendlyName": "Attributes Extension",
 	"Description": "A lightweight attributes system for Unreal Engine 4",
 	"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/content/1f0ba37099a14e228a1ce5e4891ed70a",

diff --git a/Source/Editor/Private/Customizations/AttrModifierCustomization.cpp b/Source/Editor/Private/Customizations/AttrModifierCustomization.cpp
@@ -32,66 +32,77 @@ void FAttrModifierCustomization::CustomizeHeader(TSharedRef<IPropertyHandle> Str
 
 void FAttrModifierCustomization::CustomizeChildren(TSharedRef<IPropertyHandle> StructPropertyHandle, IDetailChildrenBuilder& StructBuilder, IPropertyTypeCustomizationUtils& StructCustomizationUtils)
 {
-	StructBuilder.AddCustomRow(LOCTEXT("Search", "Values")).WholeRowContent()
-	[
-		SNew(SHorizontalBox)
-		+ SHorizontalBox::Slot()
-		.Padding(4, 0)
+	const bool bHideIncrement = StructHandle->HasMetaData("HideIncrement");
+	const bool bHideLastMultiplier = StructHandle->HasMetaData("HideLastMultiplier");
+	const bool bHideBaseMultiplier = StructHandle->HasMetaData("HideBaseMultiplier");
+
+	TSharedRef<SHorizontalBox> ModListWidget = SNew(SHorizontalBox);
+
+	if (!bHideIncrement)
+	{
+		ModListWidget->AddSlot()
+		.HAlign(HAlign_Fill)
+		.MaxWidth(100.f)
+		.Padding(2, 0)
 		[
 			SNew(SVerticalBox)
 			+ SVerticalBox::Slot()
 			[
 				IncrementHandle->CreatePropertyNameWidget()
 			]
 			+ SVerticalBox::Slot()
-			.HAlign(HAlign_Left)
+			.HAlign(HAlign_Fill)
 			[
-				SNew(SBox)
-				.MinDesiredWidth(120.f)
-				.MaxDesiredWidth(200.f)
-				[
-					IncrementHandle->CreatePropertyValueWidget()
-				]
+				IncrementHandle->CreatePropertyValueWidget()
 			]
-		]
-		+ SHorizontalBox::Slot()
-		.Padding(4, 0)
+		];
+	}
+
+	if (!bHideLastMultiplier)
+	{
+		ModListWidget->AddSlot()
+		.HAlign(HAlign_Fill)
+		.MaxWidth(100.f)
+		.Padding(2, 0)
 		[
 			SNew(SVerticalBox)
 			+ SVerticalBox::Slot()
 			[
 				LastMultiplierHandle->CreatePropertyNameWidget()
 			]
 			+ SVerticalBox::Slot()
-			.HAlign(HAlign_Left)
+			.HAlign(HAlign_Fill)
 			[
-				SNew(SBox)
-				.MinDesiredWidth(120.f)
-				.MaxDesiredWidth(200.f)
-				[
-					LastMultiplierHandle->CreatePropertyValueWidget()
-				]
+				LastMultiplierHandle->CreatePropertyValueWidget()
 			]
-		]
-		+ SHorizontalBox::Slot()
-		.Padding(4, 0)
+		];
+	}
+
+	if (!bHideBaseMultiplier)
+	{
+		ModListWidget->AddSlot()
+		.HAlign(HAlign_Fill)
+		.MaxWidth(100.f)
+		.Padding(2, 0)
 		[
 			SNew(SVerticalBox)
 			+ SVerticalBox::Slot()
 			[
 				BaseMultiplierHandle->CreatePropertyNameWidget()
 			]
 			+ SVerticalBox::Slot()
-			.HAlign(HAlign_Left)
+			.HAlign(HAlign_Fill)
 			[
-				SNew(SBox)
-				.MinDesiredWidth(120.f)
-				.MaxDesiredWidth(200.f)
-				[
-					BaseMultiplierHandle->CreatePropertyValueWidget()
-				]
+				BaseMultiplierHandle->CreatePropertyValueWidget()
 			]
-		]
+		];
+	}
+
+	StructBuilder.AddCustomRow(LOCTEXT("Search", "Values"))
+	.ValueContent()
+	.MinDesiredWidth(500.f)
+	[
+		ModListWidget
 	];
 }