fixed SDockTab

Roberto De Ioris · Roberto De Ioris · commit bab1371c36b8 · 2018-09-07T18:19:54.000+02:00
diff --git a/Source/UnrealEnginePython/Private/Slate/UEPyFTabSpawnerEntry.cpp b/Source/UnrealEnginePython/Private/Slate/UEPyFTabSpawnerEntry.cpp
@@ -36,8 +36,8 @@ static PyMethodDef ue_PyFTabSpawnerEntry_methods[] = {
 
 static PyObject *ue_PyFTabSpawnerEntry_str(ue_PyFTabSpawnerEntry *self)
 {
-	return PyUnicode_FromFormat("<unreal_engine.FTabSpawnerEntry {'name': %s}>",
-		PyUnicode_FromString(TCHAR_TO_UTF8(*self->spawner_entry->GetDisplayName().ToString())));
+	return PyUnicode_FromFormat("<unreal_engine.FTabSpawnerEntry {'name': '%s'}>",
+		TCHAR_TO_UTF8(*self->spawner_entry->GetDisplayName().ToString()));
 }
 
 static PyTypeObject ue_PyFTabSpawnerEntryType = {
diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySlate.cpp b/Source/UnrealEnginePython/Private/Slate/UEPySlate.cpp
@@ -756,9 +756,9 @@ FLinearColor FPythonSlateDelegate::GetterFLinearColor() const
 
 TSharedRef<SDockTab> FPythonSlateDelegate::SpawnPythonTab(const FSpawnTabArgs &args)
 {
+	FScopePythonGIL gil;
 	TSharedRef<SDockTab> dock_tab = SNew(SDockTab).TabRole(ETabRole::NomadTab);
-	PyObject *py_dock = (PyObject *)ue_py_get_swidget(dock_tab);
-	PyObject *ret = PyObject_CallFunction(py_callable, (char *)"O", py_dock);
+	PyObject *ret = PyObject_CallFunction(py_callable, (char *)"N", ue_py_get_swidget(dock_tab));
 	if (!ret)
 	{
 		unreal_engine_py_log_error();
@@ -1400,7 +1400,8 @@ PyObject *py_unreal_engine_register_nomad_tab_spawner(PyObject * self, PyObject
 
 	char *name;
 	PyObject *py_callable;
-	if (!PyArg_ParseTuple(args, "sO:register_nomad_tab_spawner", &name, &py_callable))
+	PyObject *py_icon = nullptr;
+	if (!PyArg_ParseTuple(args, "sO|O:register_nomad_tab_spawner", &name, &py_callable, &py_icon))
 	{
 		return NULL;
 	}
@@ -1412,14 +1413,33 @@ PyObject *py_unreal_engine_register_nomad_tab_spawner(PyObject * self, PyObject
 	TSharedRef<FPythonSlateDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewStaticSlateDelegate(py_callable);
 	spawn_tab.BindSP(py_delegate, &FPythonSlateDelegate::SpawnPythonTab);
 
-	FTabSpawnerEntry *spawner_entry = &FGlobalTabmanager::Get()->RegisterNomadTabSpawner(UTF8_TO_TCHAR(name), spawn_tab)
+	FName TabName = FName(UTF8_TO_TCHAR(name));
+
+	// avoid crash if re-registering the same tab
+	FGlobalTabmanager::Get()->UnregisterNomadTabSpawner(TabName);
+
+	FSlateIcon Icon = FSlateIcon();
+	if (py_icon)
+	{
+		ue_PyFSlateIcon *slate_icon = py_ue_is_fslate_icon(py_icon);
+		if (!slate_icon)
+		{
+			return PyErr_Format(PyExc_Exception, "argument is not a FSlateIcon");
+		}
+		Icon = slate_icon->icon;
+	}
+
+	FTabSpawnerEntry *SpawnerEntry = &FGlobalTabmanager::Get()->RegisterNomadTabSpawner(TabName, spawn_tab)
+		.SetDisplayName(FText::FromString((TabName).ToString()))
+		.SetTooltipText(FText::FromString((TabName).ToString()))
+		.SetIcon(Icon)
 		// TODO: more generic way to set the group
 #if WITH_EDITOR
 		.SetGroup(WorkspaceMenu::GetMenuStructure().GetDeveloperToolsMiscCategory())
 #endif
 		;
 
-	PyObject *ret = py_ue_new_ftab_spawner_entry(spawner_entry);
+	PyObject *ret = py_ue_new_ftab_spawner_entry(SpawnerEntry);
 	Py_INCREF(ret);
 	return ret;
 }

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ static PyMethodDef ue_PyFTabSpawnerEntry_methods[] = {`
`36`	`36`
`37`	`37`	`static PyObject ue_PyFTabSpawnerEntry_str(ue_PyFTabSpawnerEntry self)`
`38`	`38`	`{`
`39`		`- return PyUnicode_FromFormat("<unreal_engine.FTabSpawnerEntry {'name': %s}>",`
`40`		`- PyUnicode_FromString(TCHAR_TO_UTF8(*self->spawner_entry->GetDisplayName().ToString())));`
	`39`	`+ return PyUnicode_FromFormat("<unreal_engine.FTabSpawnerEntry {'name': '%s'}>",`
	`40`	`+ TCHAR_TO_UTF8(*self->spawner_entry->GetDisplayName().ToString()));`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`static PyTypeObject ue_PyFTabSpawnerEntryType = {`