[FIX] 5.5 warnings

Well-known-Game-Studio · Nov 24, 2024 · 8e4e08e · 8e4e08e
1 parent ed73e2f
commit 8e4e08e
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@
 		- [Code Style](#code-style)
 		- [Commit messages](#commit-messages)
 
-Supported unreal versions: `5.2`, `5.3`, `5.4`
+Supported unreal versions: `5.3`, `5.4`, `5.5`
 
 ## Features
 

diff --git a/Source/DlgSystem/GameplayDebugger/SDlgDataDisplay.cpp b/Source/DlgSystem/GameplayDebugger/SDlgDataDisplay.cpp
@@ -31,7 +31,7 @@ void SDlgDataDisplay::Construct(const FArguments& InArgs, const TWeakObjectPtr<c
 	WorldContextObjectPtr = InWorldContextObjectPtr;
 	RootTreeItem = MakeShared<FDlgDataDisplayTreeRootNode>();
 	ActorsTreeView = SNew(STreeView<TSharedPtr<FDlgDataDisplayTreeNode>>)
-		.ItemHeight(32)
+		// .ItemHeight(32)
 		.TreeItemsSource(&RootChildren)
 		.OnGenerateRow(this, &Self::HandleGenerateRow)
 		.OnSelectionChanged(this, &Self::HandleTreeSelectionChanged)

diff --git a/Source/DlgSystem/IO/DlgJsonParser.cpp b/Source/DlgSystem/IO/DlgJsonParser.cpp
@@ -740,7 +740,13 @@ bool FDlgJsonParser::JsonValueToProperty(const TSharedPtr<FJsonValue>& JsonValue
 	for (int32 Index = 0; Index < ItemsToRead; ++Index)
 	{
 		// ValuePtr + Index * Property->ElementSize is literally FScriptArrayHelper::GetRawPtr
-		bReturnStatus &= ConvertScalarJsonValueToProperty(ArrayValue[Index], Property, ContainerPtr, ValueIntPtr + Index * Property->ElementSize);
+#if NY_ENGINE_VERSION >= 505
+		const int32 ElementSize = Property->GetElementSize();
+#else
+		const int32 ElementSize = Property->ElementSize;
+#endif
+
+		bReturnStatus &= ConvertScalarJsonValueToProperty(ArrayValue[Index], Property, ContainerPtr, ValueIntPtr + Index * ElementSize);
 	}
 	return bReturnStatus;
 }

diff --git a/Source/DlgSystem/IO/DlgJsonWriter.cpp b/Source/DlgSystem/IO/DlgJsonWriter.cpp
@@ -409,7 +409,13 @@ TSharedPtr<FJsonValue> FDlgJsonWriter::PropertyToJsonValue(const FProperty* Prop
 		IndexInArray = Index;
 
 		// ValuePtr + Index * Property->ElementSize is literally FScriptArrayHelper::GetRawPtr
-		const TSharedPtr<FJsonValue> JsonValue = ConvertScalarPropertyToJsonValue(Property, ContainerPtr, ValueIntPtr + Index * Property->ElementSize);
+#if NY_ENGINE_VERSION >= 505
+		const int32 ElementSize = Property->GetElementSize();
+#else
+		const int32 ElementSize = Property->ElementSize;
+#endif
+
+		const TSharedPtr<FJsonValue> JsonValue = ConvertScalarPropertyToJsonValue(Property, ContainerPtr, ValueIntPtr + Index * ElementSize);
 		if (JsonValue.IsValid())
 		{
 			Array.Add(JsonValue);

diff --git a/Source/DlgSystemEditor/Browser/SDlgBrowser.cpp b/Source/DlgSystemEditor/Browser/SDlgBrowser.cpp
@@ -111,7 +111,7 @@ void SDlgBrowser::Construct(const FArguments& InArgs)
 
 	RootTreeItem = MakeShared<FDialogueBrowserTreeRootNode>();
 	ParticipantsTreeView = SNew(STreeView<TSharedPtr<FDlgBrowserTreeNode>>)
-		.ItemHeight(32)
+		// .ItemHeight(32)
 		.TreeItemsSource(&RootChildren)
 		.OnGenerateRow(this, &Self::HandleGenerateRow)
 		.OnSelectionChanged(this, &Self::HandleTreeSelectionChanged)

diff --git a/Source/DlgSystemEditor/Editor/DetailsPanel/Widgets/SDlgTextPropertyEditableTextBox.cpp b/Source/DlgSystemEditor/Editor/DetailsPanel/Widgets/SDlgTextPropertyEditableTextBox.cpp
@@ -506,8 +506,8 @@ FText SDlgTextPropertyEditableTextBox::GetToolTipText() const
 				bIsLocalized = !TextId.IsEmpty();
 				if (bIsLocalized)
 				{
-					Namespace = TextId.GetNamespace().GetChars();
-					Key = TextId.GetKey().GetChars();
+					Namespace = TextId.GetNamespace().ToString();
+					Key = TextId.GetKey().ToString();
 				}
 #else
 				bIsLocalized = FTextLocalizationManager::Get().FindNamespaceAndKeyFromDisplayString(FTextInspector::GetSharedDisplayString(TextValue), Namespace, Key);
@@ -958,7 +958,12 @@ void SDlgTextPropertyEditableTextBox::HandleLocalizableCheckStateChanged(ECheckB
 					NewKey
 					);
 
+#if NY_ENGINE_VERSION >= 505
+				EditableTextProperty->SetText(TextIndex, FText::AsLocalizable_Advanced(*NewNamespace, *NewKey, *PropertyValue.ToString()));
+#else
 				EditableTextProperty->SetText(TextIndex, FInternationalization::Get().ForUseOnlyByLocMacroAndGraphNodeTextLiterals_CreateText(*PropertyValue.ToString(), *NewNamespace, *NewKey));
+#endif // NY_ENGINE_VERSION >= 505
+
 			}
 		}
 	}

diff --git a/Source/DlgSystemEditor/Editor/DetailsPanel/Widgets/SDlgTextPropertyPickList.cpp b/Source/DlgSystemEditor/Editor/DetailsPanel/Widgets/SDlgTextPropertyPickList.cpp
@@ -3,9 +3,8 @@
 
 #include "PropertyHandle.h"
 #include "Widgets/Input/SSearchBox.h"
+#include "Widgets/Views/STileView.h"
 #include "Framework/Application/SlateApplication.h"
-#include "DetailWidgetRow.h"
-#include "IDocumentation.h"
 #include "Layout/WidgetPath.h"
 
 #include "DlgSystem/NYEngineVersionHelpers.h"
@@ -275,10 +274,10 @@ TSharedRef<SWidget> SDlgTextPropertyPickList::GetListViewWidget()
 		.Padding(0)
 		.BorderImage(FNYAppStyle::GetBrush("NoBorder"));
 
-	ListViewWidget = SNew(SListView<TextListItem>)
+	ListViewWidget = SNew(STileView<TextListItem>)
 		.SelectionMode(ESelectionMode::Single)
 		.ListItemsSource(&Suggestions)
-		.OnGenerateRow(this, &Self::HandleListGenerateRow)
+		.OnGenerateTile(this, &Self::HandleListGenerateRow)
 		.OnSelectionChanged(this, &Self::HandleListSelectionChanged)
 		.ItemHeight(20);
 

diff --git a/Source/DlgSystemEditor/Search/SDlgFindInDialogues.cpp b/Source/DlgSystemEditor/Search/SDlgFindInDialogues.cpp
@@ -136,7 +136,7 @@ void SDlgFindInDialogues::Construct(const FArguments& InArgs, const TSharedPtr<F
 			.BorderImage(FNYAppStyle::GetBrush("Menu.Background"))
 			[
 				SAssignNew(TreeView, STreeView<TSharedPtr<FDlgSearchResult>>)
-				.ItemHeight(24)
+				// .ItemHeight(24)
 				.TreeItemsSource(&ItemsFound)
 				.OnGenerateRow(this, &Self::HandleGenerateRow)
 				.OnGetChildren(this, &Self::HandleGetChildren)