Add add_child window functionality

ikrima · ikrima · commit 0f2979d2c057 · 2017-12-08T16:18:20.000-08:00
diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySPythonMultiColumnTableRow.cpp b/Source/UnrealEnginePython/Private/Slate/UEPySPythonMultiColumnTableRow.cpp
@@ -6,7 +6,7 @@
 
 #define sw_python_multicolumn_table_row StaticCastSharedRef<SPythonMultiColumnTableRow>(self->s_compound_widget.s_widget.s_widget)
 
-static PyMethodDef ue_PySPythonListView_methods[] = {
+static PyMethodDef ue_PySPythonMultiColumnTableRow_methods[] = {
 	{ NULL }  /* Sentinel */
 };
 
@@ -38,7 +38,7 @@ PyTypeObject ue_PySPythonMultiColumnTableRowType = {
 	0,                         /* tp_weaklistoffset */
 	0,                         /* tp_iter */
 	0,                         /* tp_iternext */
-	ue_PySPythonListView_methods,             /* tp_methods */
+	ue_PySPythonMultiColumnTableRow_methods,             /* tp_methods */
 };
 
 static int ue_py_spython_multicolumn_table_row_init(ue_PySPythonMultiColumnTableRow *self, PyObject *args, PyObject *kwargs) {
diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySWindow.cpp b/Source/UnrealEnginePython/Private/Slate/UEPySWindow.cpp
@@ -108,6 +108,27 @@ static PyObject *py_ue_swindow_add_modal(ue_PySWindow *self, PyObject * args)
 }
 #endif
 
+static PyObject *py_ue_swindow_add_child(ue_PySWindow *self, PyObject * args)
+{
+    PyObject *py_obj;
+    if (!PyArg_ParseTuple(args, "O:add_child", &py_obj))
+    {
+        return NULL;
+    }
+
+    ue_PySWindow *py_swindow_child = py_ue_is_swindow(py_obj);
+    if (!py_swindow_child)
+    {
+        return PyErr_Format(PyExc_Exception, "argument is not a SWindow");
+    }
+
+    FSlateApplication::Get().AddWindowAsNativeChild(
+        StaticCastSharedRef<SWindow>(py_swindow_child->s_compound_widget.s_widget.s_widget), 
+        sw_window);
+
+    Py_RETURN_NONE;
+}
+
 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, "" },
@@ -119,6 +140,7 @@ static PyMethodDef ue_PySWindow_methods[] = {
 #if WITH_EDITOR
 	{ "add_modal", (PyCFunction)py_ue_swindow_add_modal, METH_VARARGS, "" },
 #endif
+    { "add_child", (PyCFunction)py_ue_swindow_add_child, METH_VARARGS, "" },
 	{ NULL }  /* Sentinel */
 };
 
@@ -222,7 +244,12 @@ static int ue_py_swindow_init(ue_PySWindow *self, PyObject *args, PyObject *kwar
 		sw_window->SetOnWindowClosed(handler);
 	}
 
-	FSlateApplication::Get().AddWindow(StaticCastSharedRef<SWindow>(sw_window->AsShared()), true);
+    // is it a child ?
+    PyObject *is_child = ue_py_dict_get_item(kwargs, "child");
+    if (!(is_child && PyObject_IsTrue(is_child)))
+    {
+        FSlateApplication::Get().AddWindow(StaticCastSharedRef<SWindow>(sw_window->AsShared()), true);
+    }
 
 	return 0;
 }
@@ -241,3 +268,10 @@ void ue_python_init_swindow(PyObject *ue_module)
 	Py_INCREF(&ue_PySWindowType);
 	PyModule_AddObject(ue_module, "SWindow", (PyObject *)&ue_PySWindowType);
 }
+
+ue_PySWindow *py_ue_is_swindow(PyObject *obj)
+{
+	if (!PyObject_IsInstance(obj, (PyObject *)&ue_PySWindowType))
+		return nullptr;
+	return (ue_PySWindow *)obj;
+}
diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySWindow.h b/Source/UnrealEnginePython/Private/Slate/UEPySWindow.h
@@ -14,3 +14,5 @@ typedef struct {
 } ue_PySWindow;
 
 void ue_python_init_swindow(PyObject *);
+
+ue_PySWindow *py_ue_is_swindow(PyObject *obj);
diff --git a/UnrealEnginePython.uplugin b/UnrealEnginePython.uplugin
@@ -17,7 +17,7 @@
 	"Modules": [
     {
       "Name": "UnrealEnginePython",
-      "Type": "Runtime",
+      "Type": "Developer",
       "LoadingPhase": "Default"
     },
 		{

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"Modules": [`
`18`	`18`	`{`
`19`	`19`	`"Name": "UnrealEnginePython",`
`20`		`- "Type": "Runtime",`
	`20`	`+ "Type": "Developer",`
`21`	`21`	`"LoadingPhase": "Default"`
`22`	`22`	`},`
`23`	`23`	`{`