birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix position of newly created UI element (#7510)

Browse Source 
Signed-off-by: abrmich <abrmich@amazon.com>
This commit is contained in:
michabr
2022-02-09 15:27:53 -08:00
committed by GitHub
parent 51bac9a6c0
commit e5800d738a
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Editor/HierarchyMenu.cpp
+6 -2
View File
@@ -387,7 +387,9 @@ void HierarchyMenu::New_ElementFromSlice(HierarchyWidget* hierarchy,
AZ::Vector2 viewportPosition(-1.0f,-1.0f); // indicates no viewport position specified
if (optionalPos)
{
viewportPosition = QtHelpers::QPointFToVector2(*optionalPos);
// Convert position to render viewport coords
QPointF scaledPosition = *optionalPos * hierarchy->GetEditorWindow()->GetViewport()->WidgetToViewportFactor();
viewportPosition = QtHelpers::QPointFToVector2(scaledPosition);
}
SliceMenuHelpers::CreateInstantiateSliceMenu(hierarchy,
@@ -405,7 +407,9 @@ void HierarchyMenu::New_ElementFromSlice(HierarchyWidget* hierarchy,
AZ::Vector2 viewportPosition(-1.0f,-1.0f); // indicates no viewport position specified
if (optionalPos)
{
viewportPosition = QtHelpers::QPointFToVector2(*optionalPos);
// Convert position to render viewport coords
QPointF scaledPosition = *optionalPos * hierarchy->GetEditorWindow()->GetViewport()->WidgetToViewportFactor();
viewportPosition = QtHelpers::QPointFToVector2(scaledPosition);
}
hierarchy->GetEditorWindow()->GetSliceManager()->InstantiateSliceUsingBrowser(hierarchy, viewportPosition);
}
Gems/LyShine/Code/Editor/HierarchyWidget.cpp
+4 -2
View File
@@ -1239,11 +1239,13 @@ void HierarchyWidget::AddElement(const QTreeWidgetItemRawPtrQList& selectedItems
this,
selectedItems,
childIndex,
[optionalPos](AZ::Entity* element)
[this, optionalPos](AZ::Entity* element)
{
if (optionalPos)
{
EntityHelpers::MoveElementToGlobalPosition(element, *optionalPos);
// Convert position to render viewport coords
QPoint scaledPosition = *optionalPos * GetEditorWindow()->GetViewport()->WidgetToViewportFactor();
EntityHelpers::MoveElementToGlobalPosition(element, scaledPosition);
}
});
}