added submenu support, 20tab#603

Author: rdeioris

Source/UnrealEnginePython/Private/Slate/UEPyFMenuBuilder.cpp

@@ -63,6 +63,32 @@ static PyObject *py_ue_fmenu_builder_add_menu_entry(ue_PyFMenuBuilder *self, PyO
 	Py_RETURN_NONE;
 }
 
+static PyObject *py_ue_fmenu_builder_add_sub_menu(ue_PyFMenuBuilder *self, PyObject * args)
+{
+	char *label;
+	char *tooltip;
+	PyObject *py_callable;
+	PyObject *py_bool = nullptr;
+	if (!PyArg_ParseTuple(args, "ssO|O:add_sub_menu", &label, &tooltip, &py_callable, &py_bool))
+		return nullptr;
+
+	if (!PyCallable_Check(py_callable))
+	{
+		return PyErr_Format(PyExc_Exception, "argument is not callable");
+	}
+
+	
+	TSharedRef<FPythonSlateDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewStaticSlateDelegate(py_callable);
+
+	FNewMenuDelegate menu_delegate;
+	menu_delegate.BindSP(py_delegate, &FPythonSlateDelegate::SubMenuPyBuilder);
+
+
+	self->menu_builder.AddSubMenu(FText::FromString(UTF8_TO_TCHAR(label)), FText::FromString(UTF8_TO_TCHAR(tooltip)), menu_delegate, (py_bool && PyObject_IsTrue(py_bool)) ? true : false);
+
+	Py_RETURN_NONE;
+}
+
 static PyObject *py_ue_fmenu_builder_add_menu_separator(ue_PyFMenuBuilder *self, PyObject * args)
 {
 	char *name = nullptr;
@@ -130,6 +156,7 @@ static PyMethodDef ue_PyFMenuBuilder_methods[] = {
 	{ "add_menu_entry", (PyCFunction)py_ue_fmenu_builder_add_menu_entry, METH_VARARGS, "" },
 	{ "add_menu_separator", (PyCFunction)py_ue_fmenu_builder_add_menu_separator, METH_VARARGS, "" },
 	{ "add_search_widget", (PyCFunction)py_ue_fmenu_builder_add_search_widget, METH_VARARGS, "" },
+	{ "add_sub_menu", (PyCFunction)py_ue_fmenu_builder_add_sub_menu, METH_VARARGS, "" },
 #if WITH_EDITOR
 	{ "add_asset_actions", (PyCFunction)py_ue_fmenu_builder_add_asset_actions, METH_VARARGS, "" },
 #endif

Source/UnrealEnginePython/Private/Slate/UEPySlate.cpp

@@ -416,6 +416,20 @@ void FPythonSlateDelegate::MenuPyAssetBuilder(FMenuBuilder &Builder, TArray<FAss
 	Py_DECREF(ret);
 }
 
+
+void FPythonSlateDelegate::SubMenuPyBuilder(FMenuBuilder &Builder)
+{
+	FScopePythonGIL gil;
+
+	PyObject *ret = PyObject_CallFunction(py_callable, (char *)"N", py_ue_new_fmenu_builder(Builder));
+	if (!ret)
+	{
+		unreal_engine_py_log_error();
+		return;
+	}
+	Py_DECREF(ret);
+}
+
 TSharedRef<FExtender> FPythonSlateDelegate::OnExtendContentBrowserMenu(const TArray<FAssetData>& SelectedAssets)
 {
 	TSharedRef<FExtender> Extender(new FExtender());
@@ -1321,6 +1335,7 @@ PyObject *py_unreal_engine_add_menu_bar_extension(PyObject * self, PyObject * ar
 	if (!PyCallable_Check(py_callable))
 		return PyErr_Format(PyExc_Exception, "argument is not callable");
 
+
 	TSharedRef<FPythonSlateCommands> *commands = new TSharedRef<FPythonSlateCommands>(new FPythonSlateCommands());
 
 	commands->Get().Setup(command_name, py_callable);
@@ -1332,8 +1347,7 @@ PyObject *py_unreal_engine_add_menu_bar_extension(PyObject * self, PyObject * ar
 
 	ExtensibleModule.GetMenuExtensibilityManager()->AddExtender(extender);
 
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
 
 PyObject *py_unreal_engine_add_tool_bar_extension(PyObject * self, PyObject * args)

Source/UnrealEnginePython/Private/Slate/UEPySlateDelegate.h

@@ -45,6 +45,7 @@ class FPythonSlateDelegate : public FPythonSmartDelegate
 	void OnAssetSelected(const FAssetData& AssetData);
 	TSharedRef<FExtender> OnExtendContentBrowserMenu(const TArray<FAssetData> &SelectedAssets);
 	void MenuPyAssetBuilder(FMenuBuilder &Builder, TArray<FAssetData> SelectedAssets);
+	void SubMenuPyBuilder(FMenuBuilder &Builder);
 	void OnAssetChanged(const FAssetData &AssetData);
 	bool OnShouldFilterAsset(const FAssetData& AssetData);
 #endif

Source/UnrealEnginePython/Private/UnrealEnginePython.cpp

@@ -362,7 +362,11 @@ void FUnrealEnginePythonModule::StartupModule()
 
 		const int32 MaxPathVarLen = 32768;
 		FString OrigPathVar = FString::ChrN(MaxPathVarLen, TEXT('\0'));
+#if ENGINE_MINOR_VERSION >= 21
+		OrigPathVar = FPlatformMisc::GetEnvironmentVariable(TEXT("PATH"));
+#else
 		FPlatformMisc::GetEnvironmentVariable(TEXT("PATH"), OrigPathVar.GetCharArray().GetData(), MaxPathVarLen);
+#endif
 
 		// Get the current path and remove elements with python in them, we don't want any conflicts
 		const TCHAR* PathDelimiter = FPlatformMisc::GetPathVarDelimiter();