refactored slate delegates [2]

Author: Roberto De Ioris

Source/UnrealEnginePython/Private/Slate/UEPyFMenuBuilder.cpp

@@ -53,7 +53,7 @@ static PyObject *py_ue_fmenu_builder_add_menu_entry(ue_PyFMenuBuilder *self, PyO
 
 
 	FExecuteAction handler;
-	TSharedRef<FPythonSlateDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewSlateDelegate(self->s_widget, py_callable);
+	TSharedRef<FPythonSlateDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewStaticSlateDelegate(py_callable);
 
 	if (py_obj)
 	{

Source/UnrealEnginePython/Private/Slate/UEPyFToolBarBuilder.cpp

@@ -47,7 +47,7 @@ static PyObject *py_ue_ftool_bar_builder_add_tool_bar_button(ue_PyFToolBarBuilde
 	}
 
 	FExecuteAction handler;
-	TSharedRef<FPythonSlateDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewSlateDelegate(self->s_widget, py_callable);
+	TSharedRef<FPythonSlateDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewStaticSlateDelegate(py_callable);
 
 	if (py_obj)
 	{

Source/UnrealEnginePython/Private/Slate/UEPySPythonShelf.cpp

@@ -146,7 +146,7 @@ static int ue_py_spython_shelf_init(ue_PySPythonShelf *self, PyObject *args, PyO
 	if (py_callable_double_clicked)
 	{
 		FOnAssetDoubleClicked handler;
-		TSharedRef<FPythonSlateDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewSlateDelegate(self->s_widget, py_callable_double_clicked);
+		TSharedRef<FPythonSlateDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewStaticSlateDelegate(py_callable_double_clicked);
 		handler.BindSP(py_delegate, &FPythonSlateDelegate::OnAssetDoubleClicked);
 
 
@@ -156,7 +156,7 @@ static int ue_py_spython_shelf_init(ue_PySPythonShelf *self, PyObject *args, PyO
 	if (py_callable_get_context_menu)
 	{
 		FOnGetAssetContextMenu handler;
-		TSharedRef<FPythonSlateDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewSlateDelegate(self->s_widget, py_callable_get_context_menu);
+		TSharedRef<FPythonSlateDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewStaticSlateDelegate(py_callable_get_context_menu);
 
 		handler.BindSP(py_delegate, &FPythonSlateDelegate::OnGetAssetContextMenu);
 
@@ -166,7 +166,7 @@ static int ue_py_spython_shelf_init(ue_PySPythonShelf *self, PyObject *args, PyO
 	if (py_callable_asset_selected)
 	{
 		FOnAssetSelected handler;
-		TSharedRef<FPythonSlateDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewSlateDelegate(self->s_widget, py_callable_asset_selected);
+		TSharedRef<FPythonSlateDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewStaticSlateDelegate(py_callable_asset_selected);
 
 		handler.BindSP(py_delegate, &FPythonSlateDelegate::OnAssetSelected);
 

Source/UnrealEnginePython/Private/Slate/UEPySWindow.cpp

@@ -243,7 +243,7 @@ static int ue_py_swindow_init(ue_PySWindow *self, PyObject *args, PyObject *kwar
 	if (on_closed && PyCalllable_Check_Extended(on_closed))
 	{
 		FOnWindowClosed handler;
-		TSharedRef<FPythonSlateDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewSlateDelegate(self->s_widget, on_closed);
+		TSharedRef<FPythonSlateDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewSlateDelegate(self->s_compound_widget.s_widget.s_widget, on_closed);
 		handler.BindSP(py_delegate, &FPythonSlateDelegate::OnWindowClosed);
 
 		sw_window->SetOnWindowClosed(handler);

Source/UnrealEnginePython/Private/Slate/UEPySlate.cpp

@@ -1326,7 +1326,7 @@ PyObject *py_unreal_engine_add_asset_view_context_menu_extension(PyObject * self
 	TArray<FContentBrowserMenuExtender_SelectedAssets> &Extenders = ContentBrowser.GetAllAssetViewContextMenuExtenders();
 
 	FContentBrowserMenuExtender_SelectedAssets handler;
-	TSharedRef<FPythonSlateDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewSlateDelegate(self->s_widget, py_callable);
+	TSharedRef<FPythonSlateDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewStaticSlateDelegate(py_callable);
 	handler.BindSP(py_delegate, &FPythonSlateDelegate::OnExtendContentBrowserMenu);
 
 	Extenders.Add(handler);
@@ -1349,7 +1349,7 @@ PyObject *py_unreal_engine_register_nomad_tab_spawner(PyObject * self, PyObject
 		return PyErr_Format(PyExc_Exception, "argument is not callable");
 
 	FOnSpawnTab spawn_tab;
-	TSharedRef<FPythonSlateDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewSlateDelegate(self->s_widget, py_callable);
+	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)
@@ -1454,7 +1454,7 @@ PyObject *py_unreal_engine_open_color_picker(PyObject *self, PyObject *args, PyO
 		return PyErr_Format(PyExc_Exception, "on_color_committed must be a callable");
 	}
 
-	TSharedRef<FPythonSlateDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewSlateDelegate(self->s_widget, py_callable);
+	TSharedRef<FPythonSlateDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewStaticSlateDelegate(py_callable);
 	FColorPickerArgs color_args;
 	color_args.OnColorCommitted.BindSP(py_delegate, &FPythonSlateDelegate::OnLinearColorChanged);
 

Source/UnrealEnginePython/Public/PythonHouseKeeper.h

@@ -218,11 +218,22 @@ class FUnrealEnginePythonHouseKeeper
 		return Delegate;
 	}
 
+	TSharedRef<FPythonSlateDelegate> NewStaticSlateDelegate(PyObject *PyCallable)
+	{
+		TSharedRef<FPythonSlateDelegate> Delegate = MakeShareable(new FPythonSlateDelegate());
+		Delegate->SetPyCallable(PyCallable);
+
+		PyStaticSlateDelegatesTracker.Add(Delegate);
+
+		return Delegate;
+	}
+
 private:
 	TMap<UObject *, FPythonUOjectTracker> UObjectPyMapping;
 	TArray<FPythonDelegateTracker> PyDelegatesTracker;
 
 
 	TArray<FPythonSWidgetTracker> PySlateTracker;
 	TArray<FPythonSWidgetDelegateTracker> PySlateDelegatesTracker;
+	TArray<TSharedRef<FPythonSlateDelegate>> PyStaticSlateDelegatesTracker;
 };