Node title now takes the name of the assigned combo action.
This commit is contained in:
parent
780409b060
commit
49ffadd4f3
@ -15,6 +15,7 @@
|
|||||||
#include "Ed/EdComboActionGraphNode.h"
|
#include "Ed/EdComboActionGraphNode.h"
|
||||||
#include "Helpers/ComboActionGraphColors.h"
|
#include "Helpers/ComboActionGraphColors.h"
|
||||||
#include "Nodes/ComboActionGraphNode_ActionNodeBase.h"
|
#include "Nodes/ComboActionGraphNode_ActionNodeBase.h"
|
||||||
|
#include "Nodes/ComboActionGraphNode_StartNode.h"
|
||||||
#include "Settings/ComboActionGraphEditorSettings.h"
|
#include "Settings/ComboActionGraphEditorSettings.h"
|
||||||
#include "Widgets/Layout/SGridPanel.h"
|
#include "Widgets/Layout/SGridPanel.h"
|
||||||
#include "Widgets/Layout/SScaleBox.h"
|
#include "Widgets/Layout/SScaleBox.h"
|
||||||
@ -151,6 +152,9 @@ void SEdComboActionGraphNode::UpdateGraphNode()
|
|||||||
this->LeftNodeBox.Reset();
|
this->LeftNodeBox.Reset();
|
||||||
this->OutputPinBox.Reset();
|
this->OutputPinBox.Reset();
|
||||||
|
|
||||||
|
// Set this here so that it isn't null.
|
||||||
|
SAssignNew(this->InlineEditableText, SInlineEditableTextBlock);
|
||||||
|
|
||||||
TSharedPtr<SErrorText> ErrorText;
|
TSharedPtr<SErrorText> ErrorText;
|
||||||
TSharedPtr<SNodeTitle> NodeTitle = SNew(SNodeTitle, this->GraphNode);
|
TSharedPtr<SNodeTitle> NodeTitle = SNew(SNodeTitle, this->GraphNode);
|
||||||
|
|
||||||
@ -309,17 +313,14 @@ void SEdComboActionGraphNode::UpdateGraphNode()
|
|||||||
.HAlign(EHorizontalAlignment::HAlign_Center)
|
.HAlign(EHorizontalAlignment::HAlign_Center)
|
||||||
.AutoHeight()
|
.AutoHeight()
|
||||||
[
|
[
|
||||||
SAssignNew(InlineEditableText, SInlineEditableTextBlock)
|
SNew(STextBlock)
|
||||||
.Style(ComboInputEditorModule.GetComboInputEditorStyleSet().Get(), "MDSStyleSet.NodeTitleInlineEditableText")
|
.Text(this, &SEdComboActionGraphNode::GetComboActionName)
|
||||||
.Text(NodeTitle.Get(), &SNodeTitle::GetHeadTitle)
|
|
||||||
.OnVerifyTextChanged(
|
|
||||||
this, &SEdComboActionGraphNode::OnVerifyNameTextChanged)
|
|
||||||
.OnTextCommitted(
|
|
||||||
this, &SEdComboActionGraphNode::OnNameTextCommitted)
|
|
||||||
.IsReadOnly(this, &SEdComboActionGraphNode::IsNameReadOnly)
|
|
||||||
.IsSelected(this, &SEdComboActionGraphNode::IsSelectedExclusively)
|
|
||||||
.Justification(ETextJustify::Center)
|
.Justification(ETextJustify::Center)
|
||||||
.Visibility(EVisibility::Visible)
|
.Visibility(EVisibility::Visible)
|
||||||
|
.Font(FCoreStyle::GetDefaultFontStyle("Bold", 14))
|
||||||
|
.ColorAndOpacity(FSlateColor(FLinearColor(230.0f / 255.0f, 230.0f / 255.0f, 230.0f / 255.0f)))
|
||||||
|
.ShadowOffset(FVector2D(2, 2))
|
||||||
|
.ShadowColorAndOpacity(FLinearColor(0.f, 0.f, 0.f, 0.7f))
|
||||||
]
|
]
|
||||||
|
|
||||||
+ SVerticalBox::Slot()
|
+ SVerticalBox::Slot()
|
||||||
@ -342,15 +343,15 @@ void SEdComboActionGraphNode::UpdateGraphNode()
|
|||||||
.HAlign(EHorizontalAlignment::HAlign_Fill)
|
.HAlign(EHorizontalAlignment::HAlign_Fill)
|
||||||
[
|
[
|
||||||
SNew(SVerticalBox)
|
SNew(SVerticalBox)
|
||||||
+ SVerticalBox::Slot()
|
//+ SVerticalBox::Slot()
|
||||||
[
|
//[
|
||||||
SNew(SBox)
|
// SNew(SBox)
|
||||||
.Visibility(this, &SEdComboActionGraphNode::ShowDecoratorsBottomPadding)
|
// .Visibility(this, &SEdComboActionGraphNode::ShowDecoratorsBottomPadding)
|
||||||
[
|
// [
|
||||||
SNew(SSpacer)
|
// SNew(SSpacer)
|
||||||
.Size(FVector2D(0.f, 2.5f))
|
// .Size(FVector2D(0.f, 2.5f))
|
||||||
]
|
// ]
|
||||||
]
|
//]
|
||||||
|
|
||||||
#pragma region ResponseStack
|
#pragma region ResponseStack
|
||||||
// RESPONSE STACK
|
// RESPONSE STACK
|
||||||
@ -826,6 +827,25 @@ FText SEdComboActionGraphNode::GetTooltipText() const
|
|||||||
return LOCTEXT("SEdComboActionGraphNode_Tooltip", "invalid node selected");
|
return LOCTEXT("SEdComboActionGraphNode_Tooltip", "invalid node selected");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
FText SEdComboActionGraphNode::GetComboActionName() const
|
||||||
|
{
|
||||||
|
if (const UEdComboActionGraphNode *EdParentNode = Cast<UEdComboActionGraphNode>(this->GraphNode))
|
||||||
|
{
|
||||||
|
if (const UComboActionGraphNode_ActionNodeBase *ActionNode = Cast<UComboActionGraphNode_ActionNodeBase>(EdParentNode->ComboActionGraphNode))
|
||||||
|
{
|
||||||
|
if (UComboAction *ComboAction = ActionNode->GetComboAction())
|
||||||
|
{
|
||||||
|
return FText::FromName(ComboAction->ActionName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (const UComboActionGraphNode_StartNode *StartNode = Cast<UComboActionGraphNode_StartNode>(EdParentNode->ComboActionGraphNode))
|
||||||
|
{
|
||||||
|
return LOCTEXT("SEdComboActionGraphNode_StartName", "Start");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return LOCTEXT("SEdComboActionGraphNode_ComboActionNameNotSet", "NOT CONFIGURED");
|
||||||
|
}
|
||||||
|
|
||||||
FText SEdComboActionGraphNode::GetComboInputName() const
|
FText SEdComboActionGraphNode::GetComboInputName() const
|
||||||
{
|
{
|
||||||
if (const UEdComboActionGraphNode *EdParentNode = Cast<UEdComboActionGraphNode>(this->GraphNode))
|
if (const UEdComboActionGraphNode *EdParentNode = Cast<UEdComboActionGraphNode>(this->GraphNode))
|
||||||
@ -834,12 +854,11 @@ FText SEdComboActionGraphNode::GetComboInputName() const
|
|||||||
{
|
{
|
||||||
if (UComboInputAsset *ComboInput = ActionNode->GetComboInput())
|
if (UComboInputAsset *ComboInput = ActionNode->GetComboInput())
|
||||||
{
|
{
|
||||||
return FText::FromName(ComboInput->ComboInputName);
|
return FText::Format(LOCTEXT("SEdComboActionGraphNode_ComboInputName", "When {0}"), FText::FromName(ComboInput->ComboInputName));
|
||||||
}
|
|
||||||
return LOCTEXT("SEdComboActionGraphNode_ComboInputNull", "No Combo Input set");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return LOCTEXT("SEdComboActionGraphNode_ComboInputNameNotSet", "unset");
|
}
|
||||||
|
return LOCTEXT("SEdComboActionGraphNode_ComboInputNameNotSet", "No combo input");
|
||||||
}
|
}
|
||||||
|
|
||||||
FText SEdComboActionGraphNode::GetComboInputTriggerActionName() const
|
FText SEdComboActionGraphNode::GetComboInputTriggerActionName() const
|
||||||
@ -851,10 +870,10 @@ FText SEdComboActionGraphNode::GetComboInputTriggerActionName() const
|
|||||||
const FString &EnumNameString = StaticEnum<EComboActionTriggerEvent>()->GetNameByValue((uint8)ActionNode->GetTriggerEvent()).ToString();
|
const FString &EnumNameString = StaticEnum<EComboActionTriggerEvent>()->GetNameByValue((uint8)ActionNode->GetTriggerEvent()).ToString();
|
||||||
FString EnumType, EnumValueName;
|
FString EnumType, EnumValueName;
|
||||||
EnumNameString.Split("::", &EnumType, &EnumValueName);
|
EnumNameString.Split("::", &EnumType, &EnumValueName);
|
||||||
return FText::FromString(EnumValueName);
|
return FText::Format(LOCTEXT("SEdComboActionGraphNode_TriggerActionName", "is {0}"), FText::FromString(EnumValueName));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return LOCTEXT("SEdComboActionGraphNode_TriggerActionNameNotSet", "unset");
|
return LOCTEXT("SEdComboActionGraphNode_TriggerActionNameNotSet", "No trigger event");
|
||||||
}
|
}
|
||||||
|
|
||||||
#undef LOCTEXT_NAMESPACE
|
#undef LOCTEXT_NAMESPACE
|
||||||
|
|||||||
@ -63,6 +63,7 @@ public:
|
|||||||
|
|
||||||
FText GetTooltipText() const;
|
FText GetTooltipText() const;
|
||||||
|
|
||||||
|
FText GetComboActionName() const;
|
||||||
FText GetComboInputName() const;
|
FText GetComboInputName() const;
|
||||||
FText GetComboInputTriggerActionName() const;
|
FText GetComboInputTriggerActionName() const;
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user