improved SColorBlock, started implementation fo color picker

Author: Roberto De Ioris

Source/UnrealEnginePython/Private/Slate/UEPyFToolBarBuilder.cpp

@@ -94,7 +94,8 @@ static PyObject *py_ue_ftool_bar_builder_end_block_group(ue_PyFToolBarBuilder *s
 
 static PyObject *py_ue_ftool_bar_builder_make_widget(ue_PyFToolBarBuilder *self, PyObject * args) {
     ue_PySWidget *ret = (ue_PySWidget *)PyObject_New(ue_PySWidget, &ue_PySWidgetType);
-    new (&ret->s_widget) TSharedRef<SWidget>(self->tool_bar_builder->MakeWidget());
+	ue_py_setup_swidget(ret);
+    ret->s_widget = self->tool_bar_builder->MakeWidget();
     return (PyObject *)ret;
 }
 

Source/UnrealEnginePython/Private/Slate/UEPySColorBlock.cpp

@@ -41,7 +41,17 @@ PyTypeObject ue_PySColorBlockType = {
 };
 
 static int ue_py_scolor_block_init(ue_PySColorBlock *self, PyObject *args, PyObject *kwargs) {
-	ue_py_snew_simple(SColorBlock, s_leaf_widget.s_widget);
+	ue_py_slate_setup_farguments(SColorBlock);
+
+	ue_py_slate_farguments_flinear_color("color", Color);
+	ue_py_slate_farguments_bool("color_is_hsv", ColorIsHSV);
+	ue_py_slate_farguments_bool("ignore_alpha", IgnoreAlpha);
+	ue_py_slate_farguments_event("on_mouse_button_down", OnMouseButtonDown, FPointerEventHandler, OnMouseEvent);
+	ue_py_slate_farguments_bool("show_background_for_alpha", ShowBackgroundForAlpha);
+	ue_py_slate_farguments_fvector2d("size", Size);
+	ue_py_slate_farguments_bool("use_srgb", UseSRGB);
+
+	ue_py_snew(SColorBlock, s_leaf_widget.s_widget);
 	return 0;
 }
 

Source/UnrealEnginePython/Private/UEPyEngine.cpp

@@ -3,6 +3,8 @@
 #include "Kismet/KismetSystemLibrary.h"
 #include "Kismet/KismetMathLibrary.h"
 
+#include "Runtime/AppFramework/Public/Widgets/Colors/SColorPicker.h"
+
 PyObject *py_unreal_engine_log(PyObject * self, PyObject * args) {
 	PyObject *py_message;
 	if (!PyArg_ParseTuple(args, "O:log", &py_message)) {
@@ -699,3 +701,15 @@ PyObject *py_unreal_engine_editor_get_pie_viewport_size(PyObject *self, PyObject
 #endif
 
 
+PyObject *py_unreal_engine_open_color_picker(PyObject *self, PyObject * args) {
+	FColorPickerArgs color_args;
+	if (OpenColorPicker(color_args)) {
+		Py_RETURN_TRUE;
+	}
+	Py_RETURN_FALSE;
+}
+
+PyObject *py_unreal_engine_destroy_color_picker(PyObject *self, PyObject * args) {
+	DestroyColorPicker();
+	Py_RETURN_NONE;
+}

Source/UnrealEnginePython/Private/UEPyEngine.h

@@ -45,6 +45,9 @@ PyObject *py_unreal_engine_convert_relative_path_to_full(PyObject *, PyObject *)
 PyObject *py_unreal_engine_get_viewport_screenshot(PyObject *, PyObject *);
 PyObject *py_unreal_engine_get_viewport_size(PyObject *, PyObject *);
 
+PyObject *py_unreal_engine_open_color_picker(PyObject *, PyObject *);
+PyObject *py_unreal_engine_destroy_color_picker(PyObject *, PyObject *);
+
 #if WITH_EDITOR
 PyObject *py_unreal_engine_editor_get_active_viewport_screenshot(PyObject *, PyObject *);
 PyObject *py_unreal_engine_editor_get_pie_viewport_screenshot(PyObject *, PyObject *);

Source/UnrealEnginePython/Private/UEPyModule.cpp

@@ -278,6 +278,9 @@ static PyMethodDef unreal_engine_methods[] = {
 	{ "get_viewport_size", py_unreal_engine_get_viewport_size, METH_VARARGS, "" },
 
 	{ "get_game_viewport_client", py_unreal_engine_get_game_viewport_client, METH_VARARGS, "" },
+
+	{ "open_color_picker", py_unreal_engine_open_color_picker, METH_VARARGS, "" },
+	{ "destroy_color_picker", py_unreal_engine_destroy_color_picker, METH_VARARGS, "" },
 #if WITH_EDITOR
 	{ "editor_play_in_viewport", py_unreal_engine_editor_play_in_viewport, METH_VARARGS, "" },
 	{ "get_editor_pie_game_viewport_client", py_unreal_engine_get_editor_pie_game_viewport_client, METH_VARARGS, "" },

Source/UnrealEnginePython/UnrealEnginePython.Build.cs

@@ -111,7 +111,8 @@ public UnrealEnginePython(TargetInfo Target)
                 "MovieScene",
                 "LevelSequence",
                 "HTTP",
-                "UMG"
+                "UMG",
+                "AppFramework"
 				// ... add private dependencies that you statically link with here ...
 			}
             );