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

Address PR comments.

Browse Source 
Signed-off-by: John <jonawals@amazon.com>
This commit is contained in:
John
2021-10-07 17:19:22 +01:00
parent 317d624f6c
commit 863a7c8382
7 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/Core/LevelEditorMenuHandler.cpp
+6 -6
View File
@@ -1191,8 +1191,8 @@ void LevelEditorMenuHandler::OnEditorModeActivated(
{
if (mode == ViewportEditorMode::Component)
{
auto menuWrapper = m_actionManager->FindMenu(s_editMenuId);
if (!menuWrapper.isNull())
if (auto menuWrapper = m_actionManager->FindMenu(s_editMenuId);
!menuWrapper.isNull())
{
// copy of menu actions
auto actions = menuWrapper.Get()->actions();
@@ -1222,8 +1222,8 @@ void LevelEditorMenuHandler::OnEditorModeDeactivated(
void LevelEditorMenuHandler::AddEditMenuAction(QAction* action)
{
auto menuWrapper = m_actionManager->FindMenu(s_editMenuId);
if (!menuWrapper.isNull())
if (auto menuWrapper = m_actionManager->FindMenu(s_editMenuId);
!menuWrapper.isNull())
{
menuWrapper.Get()->addAction(action);
}
@@ -1247,8 +1247,8 @@ void LevelEditorMenuHandler::AddMenuAction(AZStd::string_view categoryId, QActio
void LevelEditorMenuHandler::RestoreEditMenuToDefault()
{
auto menuWrapper = m_actionManager->FindMenu(s_editMenuId);
if (!menuWrapper.isNull())
if (auto menuWrapper = m_actionManager->FindMenu(s_editMenuId);
!menuWrapper.isNull())
{
menuWrapper.Get()->clear();
PopulateEditMenu(menuWrapper);
Code/Editor/QtViewPaneManager.h
+1 -1
View File
@@ -247,7 +247,7 @@ private:
AZStd::unique_ptr<ViewportEditorModeNotificationsBusImpl>
m_componentModeNotifications; //!< Helper for EditorComponentModeNotificationBus so
//!< QtViewPaneManager does not need to inherit directly from it. */
//!< QtViewPaneManager does not need to inherit directly from it. */
using EditorWindowRequestBusImpl = AzToolsFramework::EditorWindowRequestBusImpl;
EditorWindowRequestBusImpl m_windowRequest; //!< Helper for EditorWindowRequestBus so
Code/Framework/AzToolsFramework/AzToolsFramework/API/ComponentModeCollectionInterface.h
+2 -1
View File
@@ -23,6 +23,7 @@ namespace AzToolsFramework
virtual ~ComponentModeCollectionInterface() = default;
//! Retrieves the list of all Component types (usually one).
virtual const AZStd::vector<AZ::Uuid>& GetComponentTypes() const = 0;
//! @note If called outside of component mode, an empty vector will be returned.
virtual AZStd::vector<AZ::Uuid> GetComponentTypes() const = 0;
};
} // namespace AzToolsFramework
Code/Framework/AzToolsFramework/AzToolsFramework/API/ViewportEditorModeTrackerNotificationBus.cpp
+1 -1
View File
@@ -13,7 +13,7 @@ namespace AzToolsFramework
{
void ViewportEditorModeNotifications::Reflect(AZ::ReflectContext* context)
{
if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
if (auto* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
{
behaviorContext->EBus<ViewportEditorModeNotificationsBus>("ViewportEditorModeNotificationsBus")
->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.cpp
+3 -2
View File
@@ -203,9 +203,10 @@ namespace AzToolsFramework
}
}
const AZStd::vector<AZ::Uuid>& ComponentModeCollection::GetComponentTypes() const
AZStd::vector<AZ::Uuid> ComponentModeCollection::GetComponentTypes() const
{
return m_activeComponentTypes;
// If in component mode, return the active component types, otherwise return an empty vector
return InComponentMode() ? m_activeComponentTypes : AZStd::vector<AZ::Uuid>{};
}
void ComponentModeCollection::BeginComponentMode()
Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.h
+1 -1
View File
@@ -92,7 +92,7 @@ namespace AzToolsFramework
void PopulateViewportUi();
// ComponentModeCollectionInterface overrides ...
const AZStd::vector<AZ::Uuid>& GetComponentTypes() const override;
AZStd::vector<AZ::Uuid> GetComponentTypes() const override;
private:
// Internal helper used by Select[|Prev|Next]ActiveComponentMode
Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp
+2 -2
View File
@@ -5710,7 +5710,7 @@ namespace AzToolsFramework
{
DisableComponentActions(this, m_entityComponentActions);
SetPropertyEditorState(m_gui, false);
const auto& componentModeTypes = m_componentModeCollection->GetComponentTypes();
const auto componentModeTypes = m_componentModeCollection->GetComponentTypes();
m_disabled = true;
if (!componentModeTypes.empty())
@@ -5735,7 +5735,7 @@ namespace AzToolsFramework
{
EnableComponentActions(this, m_entityComponentActions);
SetPropertyEditorState(m_gui, true);
const auto& componentModeTypes = m_componentModeCollection->GetComponentTypes();
const auto componentModeTypes = m_componentModeCollection->GetComponentTypes();
m_disabled = false;
for (auto componentEditor : m_componentEditors)