Change reflect in spawn points (o3de#602)

arturkamieniecki · web-flow · commit dcf64748ba4c · 2023-11-17T10:39:53.000+01:00
Signed-off-by: Artur Kamieniecki &lt;130671280+arturkamieniecki@users.noreply.github.com &gt;
diff --git a/Gems/ROS2/Code/Source/Spawner/ROS2SpawnPointComponentController.cpp b/Gems/ROS2/Code/Source/Spawner/ROS2SpawnPointComponentController.cpp
@@ -28,9 +28,9 @@ namespace ROS2
                 editContext
                     ->Class<ROS2SpawnPointComponentConfig>("ROS2SpawnPointComponentConfig", "Config for the ROS2 Spawn Point Component")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "Stores information about available spawn point")
-                    ->DataElement(AZ::Edit::UIHandlers::EntityId, &ROS2SpawnPointComponentConfig::m_name, "Name", "Name")
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &ROS2SpawnPointComponentConfig::m_name, "Name", "Name")
                     ->DataElement(
-                        AZ::Edit::UIHandlers::EntityId, &ROS2SpawnPointComponentConfig::m_info, "Info", "Spawn point detailed description");
+                        AZ::Edit::UIHandlers::Default, &ROS2SpawnPointComponentConfig::m_info, "Info", "Spawn point detailed description");
             }
         }
     }
@@ -50,8 +50,8 @@ namespace ROS2
                 editContext
                     ->Class<ROS2SpawnPointComponentController>("ROS2SpawnPointController", "Controller for the ROS2 Spawn Point Component")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &ROS2SpawnPointComponentController::m_config);
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &ROS2SpawnPointComponentController::m_config)
+                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly);
             }
         }
     }
diff --git a/Gems/ROS2/Code/Source/Spawner/ROS2SpawnPointEditorComponent.cpp b/Gems/ROS2/Code/Source/Spawner/ROS2SpawnPointEditorComponent.cpp
@@ -35,8 +35,7 @@ namespace ROS2
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                     ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/ROS2SpawnPoint.svg")
                     ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/ROS2SpawnPoint.svg")
-                    ->Attribute(AZ::Edit::Attributes::Category, "ROS2")
-                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly);
+                    ->Attribute(AZ::Edit::Attributes::Category, "ROS2");
             }
         }
     }
diff --git a/Gems/ROS2/Code/Source/Spawner/ROS2SpawnerComponentController.cpp b/Gems/ROS2/Code/Source/Spawner/ROS2SpawnerComponentController.cpp
@@ -77,8 +77,8 @@ namespace ROS2
             {
                 editContext->Class<ROS2SpawnerComponentController>("ROS2SpawnerComponentController", "Controller for ROS2SpawnerComponent")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "Manages spawning of robots in configurable locations")
-                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                    ->DataElement(AZ::Edit::UIHandlers::Default, &ROS2SpawnerComponentController::m_config);
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &ROS2SpawnerComponentController::m_config)
+                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly);
             }
         }
     }
diff --git a/Gems/ROS2/Code/Source/Spawner/ROS2SpawnerEditorComponent.cpp b/Gems/ROS2/Code/Source/Spawner/ROS2SpawnerEditorComponent.cpp
@@ -39,8 +39,7 @@ namespace ROS2
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                     ->Attribute(AZ::Edit::Attributes::Category, "ROS2")
                     ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/ROS2Spawner.svg")
-                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/ROS2Spawner.svg")
-                    ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly);
+                    ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/ROS2Spawner.svg");
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,9 @@ namespace ROS2`
`28`	`28`	`editContext`
`29`	`29`	`->Class<ROS2SpawnPointComponentConfig>("ROS2SpawnPointComponentConfig", "Config for the ROS2 Spawn Point Component")`
`30`	`30`	`->ClassElement(AZ::Edit::ClassElements::EditorData, "Stores information about available spawn point")`
`31`		`- ->DataElement(AZ::Edit::UIHandlers::EntityId, &ROS2SpawnPointComponentConfig::m_name, "Name", "Name")`
	`31`	`+ ->DataElement(AZ::Edit::UIHandlers::Default, &ROS2SpawnPointComponentConfig::m_name, "Name", "Name")`
`32`	`32`	`->DataElement(`
`33`		`- AZ::Edit::UIHandlers::EntityId, &ROS2SpawnPointComponentConfig::m_info, "Info", "Spawn point detailed description");`
	`33`	`+ AZ::Edit::UIHandlers::Default, &ROS2SpawnPointComponentConfig::m_info, "Info", "Spawn point detailed description");`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`}`
`@@ -50,8 +50,8 @@ namespace ROS2`
`50`	`50`	`editContext`
`51`	`51`	`->Class<ROS2SpawnPointComponentController>("ROS2SpawnPointController", "Controller for the ROS2 Spawn Point Component")`
`52`	`52`	`->ClassElement(AZ::Edit::ClassElements::EditorData, "")`
`53`		`- ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)`
`54`		`- ->DataElement(AZ::Edit::UIHandlers::Default, &ROS2SpawnPointComponentController::m_config);`
	`53`	`+ ->DataElement(AZ::Edit::UIHandlers::Default, &ROS2SpawnPointComponentController::m_config)`
	`54`	`+ ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly);`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,7 @@ namespace ROS2`
`35`	`35`	`->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))`
`36`	`36`	`->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/ROS2SpawnPoint.svg")`
`37`	`37`	`->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/ROS2SpawnPoint.svg")`
`38`		`- ->Attribute(AZ::Edit::Attributes::Category, "ROS2")`
`39`		`- ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly);`
	`38`	`+ ->Attribute(AZ::Edit::Attributes::Category, "ROS2");`
`40`	`39`	`}`
`41`	`40`	`}`
`42`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,8 @@ namespace ROS2`
`77`	`77`	`{`
`78`	`78`	`editContext->Class<ROS2SpawnerComponentController>("ROS2SpawnerComponentController", "Controller for ROS2SpawnerComponent")`
`79`	`79`	`->ClassElement(AZ::Edit::ClassElements::EditorData, "Manages spawning of robots in configurable locations")`
`80`		`- ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)`
`81`		`- ->DataElement(AZ::Edit::UIHandlers::Default, &ROS2SpawnerComponentController::m_config);`
	`80`	`+ ->DataElement(AZ::Edit::UIHandlers::Default, &ROS2SpawnerComponentController::m_config)`
	`81`	`+ ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly);`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,7 @@ namespace ROS2`
`39`	`39`	`->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))`
`40`	`40`	`->Attribute(AZ::Edit::Attributes::Category, "ROS2")`
`41`	`41`	`->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/ROS2Spawner.svg")`
`42`		`- ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/ROS2Spawner.svg")`
`43`		`- ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly);`
	`42`	`+ ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/ROS2Spawner.svg");`
`44`	`43`	`}`
`45`	`44`	`}`
`46`	`45`	`}`