improved SObjectPropertyEntryBox

Roberto De Ioris · Roberto De Ioris · commit 739b65a9ffc5 · 2017-08-07T16:47:54.000+02:00
diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySObjectPropertyEntryBox.cpp b/Source/UnrealEnginePython/Private/Slate/UEPySObjectPropertyEntryBox.cpp
@@ -44,6 +44,16 @@ PyTypeObject ue_PySObjectPropertyEntryBoxType = {
 static int ue_py_sobject_property_entry_box_init(ue_PySObjectPropertyEntryBox *self, PyObject *args, PyObject *kwargs) {
 	ue_py_slate_setup_farguments(SObjectPropertyEntryBox);
 
+	ue_py_slate_farguments_optional_bool("allow_clear", AllowClear);
+	ue_py_slate_farguments_optional_bool("display_browse", DisplayBrowse);
+	ue_py_slate_farguments_optional_bool("display_use_selected", DisplayUseSelected);
+	ue_py_slate_farguments_optional_bool("enable_content_picker", EnableContentPicker);
+	ue_py_slate_farguments_string("object_path", ObjectPath);
+
+	ue_py_slate_farguments_optional_uobject("allowed_class", AllowedClass, UClass);
+
+	ue_py_slate_farguments_event("on_object_changed", OnObjectChanged, FOnSetObject, OnAssetChanged);
+
 	ue_py_snew(SObjectPropertyEntryBox, s_compound_widget.s_widget);
 	return 0;
 }
diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySlate.cpp b/Source/UnrealEnginePython/Private/Slate/UEPySlate.cpp
@@ -172,6 +172,16 @@ void UPythonSlateDelegate::OnAssetSelected(const FAssetData& AssetData) {
 	Py_XDECREF(ret);
 }
 
+void UPythonSlateDelegate::OnAssetChanged(const FAssetData& AssetData) {
+	FScopePythonGIL gil;
+
+	PyObject *ret = PyObject_CallFunction(py_callable, (char *)"O", py_ue_new_fassetdata((FAssetData *)&AssetData));
+	if (!ret) {
+		unreal_engine_py_log_error();
+	}
+	Py_XDECREF(ret);
+}
+
 TSharedPtr<SWidget> UPythonSlateDelegate::OnGetAssetContextMenu(const TArray<FAssetData>& SelectedAssets) {
 	FScopePythonGIL gil;
 
diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySlate.h b/Source/UnrealEnginePython/Private/Slate/UEPySlate.h
@@ -279,6 +279,18 @@ ue_PySWidget *ue_py_get_swidget(TSharedRef<SWidget> s_widget);
 		}\
 }
 
+#define ue_py_slate_farguments_optional_uobject(param, attribute, _type) { PyObject *value = ue_py_dict_get_item(kwargs, param);\
+		if (value) {\
+			if (_type *u_object = ue_py_check_type<_type>(value)) {\
+				arguments.attribute((_type *)u_object);\
+			}\
+			else {\
+				PyErr_SetString(PyExc_TypeError, "unsupported type for attribute " param); \
+				return -1;\
+			}\
+		}\
+}
+
 
 #define ue_py_slate_farguments_optional_fvector2d(param, attribute) { PyObject *value = ue_py_dict_get_item(kwargs, param);\
 		if (value) {\
@@ -439,6 +451,7 @@ class UPythonSlateDelegate : public UPythonDelegate
 	void OnAssetSelected(const FAssetData& AssetData);
 	TSharedRef<FExtender> OnExtendContentBrowserMenu(const TArray<FAssetData> &SelectedAssets);
 	void MenuPyAssetBuilder(FMenuBuilder &Builder, TArray<FAssetData> SelectedAssets);
+	void OnAssetChanged(const FAssetData &);
 #endif
 
 	TSharedPtr<SWidget> OnContextMenuOpening();
