Focus new custom properties or class members when adding them

When adding custom class properties, they are expanded with the first
member focused.

src/tiled/propertieswidget.cpp

@@ -2538,7 +2538,8 @@ void PropertiesWidget::addProperty(const QString &name, const QVariant &value)
                                         name, value));
     }
 
-    // mPropertyBrowser->editCustomProperty(name);
+    if (auto property = mCustomProperties->property(name))
+        mPropertyBrowser->focusProperty(property);
 }
 
 void PropertiesWidget::removeProperties()

src/tiled/propertytypeseditor.cpp

@@ -572,6 +572,8 @@ void PropertyTypesEditor::openAddMemberDialog()
 
     if (dialog.exec() == AddPropertyDialog::Accepted)
         addMember(dialog.propertyName(), QVariant(dialog.propertyValue()));
+
+    activateWindow();
 }
 
 void PropertyTypesEditor::addMember(const QString &name, const QVariant &value)
@@ -593,21 +595,9 @@ void PropertyTypesEditor::addMember(const QString &name, const QVariant &value)
 
     applyMemberToSelectedType(name, value);
     updateDetails();
-    editMember(name);
-}
 
-void PropertyTypesEditor::editMember(const QString &name)
-{
-    // todo: VariantEditor needs to support focusing the widget of a specific property
-#if 0
-    QtVariantProperty *property = mPropertiesHelper->property(name);
-    if (!property)
-        return;
-
-    const QList<QtBrowserItem*> propertyItems = mMembersView->items(property);
-    if (!propertyItems.isEmpty())
-        mMembersView->editItem(propertyItems.first());
-#endif
+    if (auto property = mMembersProperty->property(name))
+        mMembersEditor->focusProperty(property);
 }
 
 void PropertyTypesEditor::removeMember()

src/tiled/propertytypeseditor.h

@@ -104,7 +104,6 @@ class PropertyTypesEditor : public QDialog
     void openClassOfPopup();
     void openAddMemberDialog();
     void addMember(const QString &name, const QVariant &value = QVariant());
-    void editMember(const QString &name);
     void removeMember();
     void renameMember(const QString &name);
     void renameMemberTo(const QString &oldName, const QString &name);

src/tiled/varianteditor.cpp

@@ -626,6 +626,38 @@ void VariantEditor::removeProperty(Property *property)
     property->disconnect(this);
 }
 
+/**
+ * Focuses the editor for the given property. Makes sure any parent group
+ * properties are expanded.
+ *
+ * When the given property is a group property, the group property is expanded
+ * and the first child property is focused.
+ */
+bool VariantEditor::focusProperty(Property *property)
+{
+    for (auto it = m_propertyWidgets.constBegin(); it != m_propertyWidgets.constEnd(); ++it) {
+        auto &widgets = it.value();
+
+        if (it.key() == property) {
+            if (widgets.editor)
+                widgets.editor->setFocus();
+            else if (auto groupProperty = qobject_cast<GroupProperty *>(it.key())) {
+                groupProperty->setExpanded(true);
+                if (widgets.children && !groupProperty->subProperties().isEmpty())
+                    widgets.children->focusProperty(groupProperty->subProperties().first());
+            }
+            return true;
+        } else if (auto groupProperty = qobject_cast<GroupProperty *>(it.key())) {
+            if (widgets.children && widgets.children->focusProperty(property)) {
+                groupProperty->setExpanded(true);
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
 void VariantEditor::setLevel(int level)
 {
     m_level = level;
@@ -1008,6 +1040,11 @@ VariantEditorView::VariantEditorView(QWidget *parent)
     setWidget(scrollWidget);
 }
 
+void VariantEditorView::focusProperty(Property *property)
+{
+    m_editor->focusProperty(property);
+}
+
 } // namespace Tiled
 
 #include "moc_varianteditor.cpp"

src/tiled/varianteditor.h

@@ -504,6 +504,8 @@ class VariantEditor : public QWidget
     void insertProperty(int index, Property *property);
     void removeProperty(Property *property);
 
+    bool focusProperty(Property *property);
+
     void setLevel(int level);
 
 private:
@@ -553,6 +555,8 @@ class VariantEditorView : public QScrollArea
     void addProperty(Property *property)
     { m_editor->addProperty(property); }
 
+    void focusProperty(Property *property);
+
 private:
     VariantEditor *m_editor;
 };

src/tiled/variantmapproperty.h

@@ -39,6 +39,8 @@ class VariantMapProperty : public GroupProperty
 
     const QVariantMap &value() const { return mValue; }
 
+    Property *property(const QString &name) const;
+
 signals:
     void memberValueChanged(const QStringList &path, const QVariant &value);
     void renameRequested(const QString &name);
@@ -85,5 +87,9 @@ class VariantMapProperty : public GroupProperty
     QSet<QStringList> mExpandedProperties;
 };
 
+inline Property *VariantMapProperty::property(const QString &name) const
+{
+    return mPropertyMap.value(name);
+}
 
 } // namespace Tiled