Skip to content

Commit e864222

Browse files
committed
Ensure Collider widgets correctly signal when they're being edited so that the changes can be picked up by the level saving mechanism.
Signed-off-by: Danilo Aimini <[email protected]>
1 parent 37c3b90 commit e864222

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringComboBoxCtrl.hxx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@ namespace AzToolsFramework
2727
class PropertyStringComboBoxCtrl
2828
: public GenericComboBoxCtrl<AZStd::string>
2929
{
30+
Q_OBJECT
31+
using ComboBoxBase = GenericComboBoxCtrl<AZStd::string>;
32+
3033
friend class StringEnumPropertyComboBoxHandler;
3134
template<typename T>
3235
friend class PropertyComboBoxHandlerCommon;
33-
Q_OBJECT
34-
using ComboBoxBase = GenericComboBoxCtrl<AZStd::string>;
3536

3637
public:
3738
AZ_RTTI(PropertyStringComboBoxCtrl, "{886E5B2C-46F5-4046-B0A3-89C28CB28B38}", ComboBoxBase);

Gems/PhysX/Core/Code/Editor/CollisionGroupWidget.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ namespace PhysX
4040
{
4141
AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
4242
&AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
43+
AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
44+
&AzToolsFramework::PropertyEditorGUIMessages::Bus::Handler::OnEditingFinished, picker);
4345
});
4446

4547
connect(picker->GetEditButton(), &QToolButton::clicked, this, &CollisionGroupWidget::OnEditButtonClicked);

Gems/PhysX/Core/Code/Editor/CollisionLayerWidget.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ namespace PhysX
3535
connect(picker->GetComboBox(), &QComboBox::currentTextChanged, this, [picker]()
3636
{
3737
AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
38-
&AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
38+
&AzToolsFramework::PropertyEditorGUIMessages::Bus::Events::RequestWrite, picker);
39+
AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
40+
&AzToolsFramework::PropertyEditorGUIMessages::Bus::Handler::OnEditingFinished, picker);
3941
});
4042

4143
connect(picker->GetEditButton(), &QToolButton::clicked, this, &CollisionLayerWidget::OnEditButtonClicked);

0 commit comments

Comments
 (0)