added automatic property widgets, fixed arrayproperty in subclassing advanced api

Roberto De Ioris · Roberto De Ioris · commit 2e8556006639 · 2017-07-29T17:38:21.000+02:00
diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySWindow.cpp b/Source/UnrealEnginePython/Private/Slate/UEPySWindow.cpp
@@ -1,6 +1,10 @@
 
 #include "UnrealEnginePythonPrivatePCH.h"
 
+#if WITH_EDITOR
+#include "Editor/MainFrame/Public/Interfaces/IMainFrameModule.h"
+#endif
+
 #include "UEPySWindow.h"
 
 #define sw_window StaticCastSharedRef<SWindow>(self->s_compound_widget.s_widget.s_widget)
@@ -41,7 +45,7 @@ static PyObject *py_ue_swindow_set_content(ue_PySWindow *self, PyObject * args)
 	if (!py_swidget) {
 		return PyErr_Format(PyExc_Exception, "argument is not a SWidget");
 	}
-	
+
 	Py_XDECREF(self->s_compound_widget.s_widget.py_swidget_content);
 	Py_INCREF(py_swidget);
 	self->s_compound_widget.s_widget.py_swidget_content = py_swidget;
@@ -73,13 +77,35 @@ static PyObject *py_ue_swindow_get_handle(ue_PySWindow *self, PyObject * args) {
 	return PyLong_FromLongLong((long long)sw_window->GetNativeWindow()->GetOSWindowHandle());
 }
 
+static PyObject *py_ue_swindow_request_destroy(ue_PySWindow *self, PyObject * args) {
+
+	sw_window->RequestDestroyWindow();
+
+	Py_RETURN_NONE;
+}
+
+#if WITH_EDITOR
+static PyObject *py_ue_swindow_add_modal(ue_PySWindow *self, PyObject * args) {
+	TSharedPtr<SWindow> parent_window;
+	if (FModuleManager::Get().IsModuleLoaded("MainFrame")) {
+		parent_window = FModuleManager::LoadModuleChecked<IMainFrameModule>("MainFrame").GetParentWindow();
+	}
+	FSlateApplication::Get().AddModalWindow(StaticCastSharedRef<SWindow>(sw_window->AsShared()), parent_window, false);
+	Py_RETURN_NONE;
+}
+#endif
+
 static PyMethodDef ue_PySWindow_methods[] = {
 	{ "set_title", (PyCFunction)py_ue_swindow_set_title, METH_VARARGS, "" },
 	{ "set_sizing_rule", (PyCFunction)py_ue_swindow_set_sizing_rule, METH_VARARGS, "" },
 	{ "resize", (PyCFunction)py_ue_swindow_resize, METH_VARARGS, "" },
 	{ "set_client_size", (PyCFunction)py_ue_swindow_resize, METH_VARARGS, "" },
 	{ "set_content", (PyCFunction)py_ue_swindow_set_content, METH_VARARGS, "" },
 	{ "get_handle", (PyCFunction)py_ue_swindow_get_handle, METH_VARARGS, "" },
+	{ "request_destroy", (PyCFunction)py_ue_swindow_request_destroy, METH_VARARGS, "" },
+#if WITH_EDITOR
+	{ "add_modal", (PyCFunction)py_ue_swindow_add_modal, METH_VARARGS, "" },
+#endif
 	{ NULL }  /* Sentinel */
 };
 
@@ -115,7 +141,7 @@ PyTypeObject ue_PySWindowType = {
 };
 
 static int ue_py_swindow_init(ue_PySWindow *self, PyObject *args, PyObject *kwargs) {
-	
+
 	ue_py_slate_setup_farguments(SWindow);
 
 	ue_py_slate_farguments_optional_bool("activate_when_first_shown", ActivateWhenFirstShown);
@@ -158,6 +184,14 @@ static int ue_py_swindow_init(ue_PySWindow *self, PyObject *args, PyObject *kwar
 
 	ue_py_snew(SWindow, s_compound_widget.s_widget);
 
+#if WITH_EDITOR
+	// is it a modal window ?
+	PyObject *is_modal = ue_py_dict_get_item(kwargs, "modal");
+	if (is_modal && PyObject_IsTrue(is_modal)) {
+		return 0;
+	}
+#endif
+
 	FSlateApplication::Get().AddWindow(StaticCastSharedRef<SWindow>(sw_window->AsShared()), true);
 
 	return 0;
diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySlate.cpp b/Source/UnrealEnginePython/Private/Slate/UEPySlate.cpp
@@ -7,6 +7,8 @@
 #include "Editor/Persona/Public/PersonaModule.h"
 #include "Editor/AnimationEditor/Public/IAnimationEditorModule.h"
 #include "Editor/StaticMeshEditor/Public/StaticMeshEditorModule.h"
+#include "Editor/PropertyEditor/Public/PropertyEditorModule.h"
+#include "Editor/PropertyEditor/Public/ISinglePropertyView.h"
 #endif
 
 #include "Runtime/Slate/Public/Framework/Commands/UICommandList.h"
@@ -194,6 +196,8 @@ TSharedPtr<SWidget> UPythonSlateDelegate::OnGetAssetContextMenu(const TArray<FAs
 	Py_DECREF(ret);
 	return value;
 }
+
+
 #endif
 
 TSharedRef<SWidget> UPythonSlateDelegate::OnGenerateWidget(TSharedPtr<FPythonItem> py_item) {
@@ -699,6 +703,73 @@ class FPythonSlateCommands : public TCommands<FPythonSlateCommands>
 };
 
 #if WITH_EDITOR
+
+PyObject *py_unreal_engine_create_detail_view(PyObject *self, PyObject * args, PyObject *kwargs) {
+
+	PyObject *py_object;
+	PyObject *py_allow_search = nullptr;
+
+	char *kwlist[] = {
+		(char *)"uobject",
+		(char *)"allow_search",
+		nullptr };
+
+	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|O:create_detail_view", kwlist,
+		&py_object, &py_allow_search)) {
+		return nullptr;
+	}
+
+	UObject *u_object = ue_py_check_type<UObject>(py_object);
+	if (!u_object) {
+		return PyErr_Format(PyExc_Exception, "argument is not a UObject");
+	}
+
+	FPropertyEditorModule& PropertyEditorModule = FModuleManager::GetModuleChecked<FPropertyEditorModule>("PropertyEditor");
+	FDetailsViewArgs view_args;
+	view_args.bAllowSearch = (py_allow_search && PyObject_IsTrue(py_allow_search));
+
+	TSharedPtr<IDetailsView> view = PropertyEditorModule.CreateDetailView(view_args);
+	view->SetObject(u_object);
+
+	return (PyObject *)py_ue_new_swidget<ue_PySWidget>(view->AsShared(), &ue_PySWidgetType);
+}
+
+PyObject *py_unreal_engine_create_property_view(PyObject *self, PyObject * args, PyObject *kwargs) {
+
+	PyObject *py_object;
+	char *name;
+	char *name_override = nullptr;
+
+	char *kwlist[] = {
+		(char*)"uobject",
+		(char *)"name",
+		(char *)"name_override",
+		nullptr };
+
+	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Os|s:create_property_view", kwlist,
+		&py_object, &name, &name_override)) {
+		return nullptr;
+	}
+
+	UObject *u_object = ue_py_check_type<UObject>(py_object);
+	if (!u_object) {
+		return PyErr_Format(PyExc_Exception, "argument is not a UObject");
+	}
+
+	FPropertyEditorModule& PropertyEditorModule = FModuleManager::GetModuleChecked<FPropertyEditorModule>("PropertyEditor");
+	FSinglePropertyParams params;
+	if (name_override)
+		params.NameOverride = FText::FromString(UTF8_TO_TCHAR(name_override));
+
+	auto view_widget = PropertyEditorModule.CreateSingleProperty(u_object, FName(name), params);
+
+	if (!view_widget.IsValid())
+		return PyErr_Format(PyExc_Exception, "unable to create SingleProperty widget");
+
+	return (PyObject *)py_ue_new_swidget<ue_PySWidget>(view_widget->AsShared(), &ue_PySWidgetType);
+}
+
+
 PyObject *py_unreal_engine_add_menu_extension(PyObject * self, PyObject * args) {
 
 	char *command_name;
diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySlate.h b/Source/UnrealEnginePython/Private/Slate/UEPySlate.h
@@ -87,6 +87,8 @@ PyObject *py_unreal_engine_get_editor_window(PyObject *, PyObject *);
 PyObject *py_unreal_engine_add_menu_extension(PyObject *, PyObject *);
 PyObject *py_unreal_engine_add_menu_bar_extension(PyObject *, PyObject *);
 PyObject *py_unreal_engine_add_tool_bar_extension(PyObject *, PyObject *);
+PyObject *py_unreal_engine_create_detail_view(PyObject *, PyObject *, PyObject *);
+PyObject *py_unreal_engine_create_property_view(PyObject *, PyObject *, PyObject *);
 #endif
 
 PyObject *py_unreal_engine_invoke_tab(PyObject *, PyObject *);
diff --git a/Source/UnrealEnginePython/Private/UEPyModule.cpp b/Source/UnrealEnginePython/Private/UEPyModule.cpp
@@ -176,6 +176,11 @@ static PyMethodDef unreal_engine_methods[] = {
 	{ "add_menu_bar_extension", py_unreal_engine_add_menu_bar_extension, METH_VARARGS, "" },
 	{ "add_tool_bar_extension", py_unreal_engine_add_tool_bar_extension, METH_VARARGS, "" },
 
+#pragma warning(suppress: 4191)
+	{ "create_detail_view",  (PyCFunction)py_unreal_engine_create_detail_view, METH_VARARGS | METH_KEYWORDS, "" },
+#pragma warning(suppress: 4191)
+	{ "create_property_view",  (PyCFunction)py_unreal_engine_create_property_view, METH_VARARGS | METH_KEYWORDS, "" },
+
 	{ "open_editor_for_asset", py_unreal_engine_open_editor_for_asset, METH_VARARGS, "" },
 	{ "close_editor_for_asset", py_unreal_engine_close_editor_for_asset, METH_VARARGS, "" },
 	{ "close_all_asset_editors", py_unreal_engine_close_all_asset_editors, METH_VARARGS, "" },
@@ -1162,7 +1167,7 @@ static int unreal_engine_py_init(ue_PyUObject *self, PyObject *args, PyObject *k
 				if (PyList_Size(value) == 1) {
 					PyObject *first_item = PyList_GetItem(value, 0);
 					if (ue_is_pyuobject(first_item)) {
-						ue_PyUObject *py_obj = (ue_PyUObject *)value;
+						ue_PyUObject *py_obj = (ue_PyUObject *)first_item;
 						if (py_obj->ue_object->IsA<UClass>()) {
 							UClass *p_class = (UClass *)py_obj->ue_object;
 							if (p_class->IsChildOf<UProperty>()) {
@@ -1172,6 +1177,13 @@ static int unreal_engine_py_init(ue_PyUObject *self, PyObject *args, PyObject *k
 								}
 								prop_added = true;
 							}
+							else {
+								if (!py_ue_add_property(self, Py_BuildValue("([O]sO)", (PyObject *)ue_get_python_wrapper(UObjectProperty::StaticClass()), class_key, first_item))) {
+									unreal_engine_py_log_error();
+									return -1;
+								}
+								prop_added = true;
+							}
 						}
 					}
 				}
@@ -1535,7 +1547,7 @@ void unreal_engine_py_log_error() {
 	}
 
 	PyErr_Clear();
-}
+	}
 
 // retrieve a UWorld from a generic UObject (if possible)
 UWorld *ue_get_uworld(ue_PyUObject *py_obj) {
diff --git a/Source/UnrealEnginePython/Private/UObject/UEPyObject.cpp b/Source/UnrealEnginePython/Private/UObject/UEPyObject.cpp
@@ -615,13 +615,13 @@ PyObject *py_ue_get_uproperty(ue_PyUObject *self, PyObject * args) {
 	UProperty *u_property = u_struct->FindPropertyByName(FName(UTF8_TO_TCHAR(property_name)));
 	if (!u_property)
 		return PyErr_Format(PyExc_Exception, "unable to find property %s", property_name);
-	
+
 	ue_PyUObject *ret = ue_get_python_wrapper(u_property);
 	if (!ret)
 		return PyErr_Format(PyExc_Exception, "PyUObject is in invalid state");
 	Py_INCREF(ret);
 	return (PyObject *)ret;
-	
+
 }
 
 PyObject *py_ue_has_property(ue_PyUObject *self, PyObject * args) {
@@ -836,6 +836,7 @@ PyObject *py_ue_add_property(ue_PyUObject * self, PyObject * args) {
 		}
 	}
 
+
 	if (!scope) {
 		return PyErr_Format(PyExc_Exception, "argument is not a UObject or a single item list");
 	}
@@ -859,6 +860,12 @@ PyObject *py_ue_add_property(ue_PyUObject * self, PyObject * args) {
 		UArrayProperty *u_array = (UArrayProperty *)scope;
 		u_array->AddCppProperty(u_property);
 		u_property->SetPropertyFlags(flags);
+		if (u_property->GetClass() == UObjectProperty::StaticClass()) {
+			UObjectProperty *obj_prop = (UObjectProperty *)u_property;
+			if (u_prop_class) {
+				obj_prop->SetPropertyClass(u_prop_class);
+			}
+		}
 		u_property = u_array;
 	}
 
@@ -879,9 +886,12 @@ PyObject *py_ue_add_property(ue_PyUObject * self, PyObject * args) {
 	}
 
 	else if (u_class == UObjectProperty::StaticClass()) {
-		UObjectProperty *obj_prop = (UObjectProperty *)u_property;
-		if (u_prop_class) {
-			obj_prop->SetPropertyClass(u_prop_class);
+		// ensure it is not an arry as we have already managed it !
+		if (!is_array) {
+			UObjectProperty *obj_prop = (UObjectProperty *)u_property;
+			if (u_prop_class) {
+				obj_prop->SetPropertyClass(u_prop_class);
+			}
 		}
 	}
 
