Merge remote-tracking branch 'upstream/slate_refactoring' into bebylon

# Conflicts: # Source/UnrealEnginePython/Private/Slate/UEPyFMenuBuilder.cpp # Source/UnrealEnginePython/Private/Slate/UEPyFToolBarBuilder.cpp # Source/UnrealEnginePython/Private/Slate/UEPySCheckBox.cpp # Source/UnrealEnginePython/Private/Slate/UEPySDockTab.cpp # Source/UnrealEnginePython/Private/Slate/UEPySPythonComboBox.cpp # Source/UnrealEnginePython/Private/Slate/UEPySPythonListView.cpp # Source/UnrealEnginePython/Private/Slate/UEPySPythonMultiColumnTableRow.cpp # Source/UnrealEnginePython/Private/Slate/UEPySPythonMultiColumnTableRow.h # Source/UnrealEnginePython/Private/Slate/UEPySPythonTreeView.cpp # Source/UnrealEnginePython/Private/Slate/UEPySSplitter.cpp # Source/UnrealEnginePython/Private/Slate/UEPySTextBlock.cpp # Source/UnrealEnginePython/Private/Slate/UEPySWidget.cpp # Source/UnrealEnginePython/Private/Slate/UEPySlate.cpp # Source/UnrealEnginePython/Private/Slate/UEPySlate.h
ikrima · Feb 9, 2018 · Feb 9, 2018 · Feb 10, 2018 · Feb 12, 2018 · Feb 12, 2018
commit 11fea2bc7550546a7b866a0913db3eae41e6cf76
diff --git a/Source/UnrealEnginePython/Private/Slate/UEPyFMenuBuilder.cpp b/Source/UnrealEnginePython/Private/Slate/UEPyFMenuBuilder.cpp
@@ -31,8 +31,6 @@ static PyObject *py_ue_fmenu_builder_end_section(ue_PyFMenuBuilder *self, PyObje
 
 static PyObject *py_ue_fmenu_builder_make_widget(ue_PyFMenuBuilder *self, PyObject * args)
 {
-    //PyObject_New(ue_PySWidget, &ue_PySWidgetType);
-	//new (&ret->s_widget) TSharedRef<SWidget>(self->menu_builder.MakeWidget());
     ue_PySWidget *ret = py_ue_new_swidget<ue_PySWidget>(self->menu_builder.MakeWidget(), &ue_PySWidgetType);
 	return (PyObject *)ret;
 }

diff --git a/Source/UnrealEnginePython/Private/Slate/UEPyFToolBarBuilder.cpp b/Source/UnrealEnginePython/Private/Slate/UEPyFToolBarBuilder.cpp
@@ -102,11 +102,7 @@ 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);
-	//ue_py_setup_swidget(ret);
-	//ret->s_widget = self->tool_bar_builder.MakeWidget();
-    ue_PySWidget *ret = py_ue_new_swidget<ue_PySWidget>(self->tool_bar_builder.MakeWidget(), &ue_PySWidgetType);
-	return (PyObject *)ret;
+	return (PyObject *)py_ue_new_swidget<ue_PySWidget>(self->tool_bar_builder.MakeWidget(), &ue_PySWidgetType);
 }
 
 static PyMethodDef ue_PyFToolBarBuilder_methods[] = {

diff --git a/Source/UnrealEnginePython/Private/Slate/UEPyIStructureDetailsView.cpp b/Source/UnrealEnginePython/Private/Slate/UEPyIStructureDetailsView.cpp
@@ -6,7 +6,6 @@
 #include "IStructureDetailsView.h"
 
 
-//#define sw_idetails_view StaticCastSharedRef<IDetailsView>(self->s_compound_widget.s_widget.s_widget)
 
 
 static PyObject *ue_PyIStructureDetailsView_str(ue_PyIStructureDetailsView *self)

diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySBox.cpp b/Source/UnrealEnginePython/Private/Slate/UEPySBox.cpp
@@ -23,28 +23,32 @@ static PyObject *py_ue_sbox_set_content(ue_PySBox *self, PyObject * args)
 
 static PyObject *py_ue_sbox_set_height_override(ue_PySBox *self, PyObject * args)
 {
+    ue_py_slate_cast(SBox);
+
 	float height_override = 0;
 	if (!PyArg_ParseTuple(args, "f:set_height_override", &height_override))
 	{
 		return NULL;
 	}
 
 	if (height_override != 0)
-		sw_box->SetHeightOverride(height_override);
+		py_SBox->SetHeightOverride(height_override);
 
 	Py_RETURN_NONE;
 }
 
 static PyObject *py_ue_sbox_set_width_override(ue_PySBox *self, PyObject * args)
 {
+    ue_py_slate_cast(SBox);
+
 	float width_override = 0;
 	if (!PyArg_ParseTuple(args, "f:set_width_override", &width_override))
 	{
 		return NULL;
 	}
 
 	if (width_override != 0)
-		sw_box->SetWidthOverride(width_override);
+        py_SBox->SetWidthOverride(width_override);
 
 	Py_RETURN_NONE;
 }

diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySCheckBox.cpp b/Source/UnrealEnginePython/Private/Slate/UEPySCheckBox.cpp
@@ -5,42 +5,39 @@
 // Needed for PROPERTY_BINDING macro
 #include "Widget.h"
 
-#define sw_check_box StaticCastSharedRef<SCheckBox>(self->s_compound_widget.s_widget.s_widget)
-
 static PyObject *py_ue_scheck_box_set_content(ue_PySCheckBox *self, PyObject * args)
 {
+    ue_py_slate_cast(SCheckBox);
 	PyObject *py_content;
 	if (!PyArg_ParseTuple(args, "O:set_content", &py_content))
 	{
 		return NULL;
 	}
 
-	ue_PySWidget *py_swidget = py_ue_is_swidget(py_content);
-	if (!py_swidget)
-	{
-		return PyErr_Format(PyExc_Exception, "argument is not a SWidget");
-	}
+	TSharedPtr<SWidget> child = py_ue_is_swidget<SWidget>(py_content);
+    if (!child.IsValid())
+        return nullptr;
 
 
-	Py_INCREF(py_swidget);
 
+    py_SCheckBox->SetContent(child.ToSharedRef());
 
-    sw_check_box->SetContent(py_swidget->s_widget->AsShared());
-
-	Py_INCREF(self);
-	return (PyObject *)self;
+    Py_RETURN_SLATE_SELF;
 }
 
-static PyObject *py_ue_scheck_box_is_checked(ue_PySCheckBox *self, PyObject * args) {
-
-	if (sw_check_box->IsChecked()) {
+static PyObject *py_ue_scheck_box_is_checked(ue_PySCheckBox *self, PyObject * args)
+{
+	ue_py_slate_cast(SCheckBox);
+	if (py_SCheckBox->IsChecked())
+	{
 		Py_RETURN_TRUE;
 	}
-
+	
 	Py_RETURN_FALSE;
 }
 
 static PyObject *py_ue_scheck_box_set_is_checked(ue_PySCheckBox *self, PyObject * args) {
+    ue_py_slate_cast(SCheckBox);
 	PyObject *py_bool;
 	if (!PyArg_ParseTuple(args, "O:set_is_checked", &py_bool))
 	{
@@ -49,7 +46,7 @@ static PyObject *py_ue_scheck_box_set_is_checked(ue_PySCheckBox *self, PyObject
 
 	ECheckBoxState CheckedState = PyObject_IsTrue(py_bool) ? ECheckBoxState::Checked : ECheckBoxState::Unchecked;
 
-	sw_check_box->SetIsChecked(TAttribute<ECheckBoxState>(CheckedState));
+    py_SCheckBox->SetIsChecked(TAttribute<ECheckBoxState>(CheckedState));
 
 	Py_RETURN_NONE;
 }
@@ -95,7 +92,7 @@ PyTypeObject ue_PySCheckBoxType = {
 
 static int ue_py_scheck_box_init(ue_PySCheckBox *self, PyObject *args, PyObject *kwargs)
 {
-
+	
 	ue_py_slate_setup_farguments(SCheckBox);
     ue_py_slate_farguments_optional_struct_ptr("style",                     Style,                 FCheckBoxStyle);
     ue_py_slate_farguments_optional_enum      ("type",                      Type,                  ESlateCheckBoxType::Type);
@@ -104,8 +101,8 @@ static int ue_py_scheck_box_init(ue_PySCheckBox *self, PyObject *args, PyObject
     ue_py_slate_farguments_optional_enum      ("h_align",                   HAlign,                EHorizontalAlignment);
     ue_py_slate_farguments_struct             ("padding",                   Padding,               FMargin);
     ue_py_slate_farguments_enum               ("click_method",              ClickMethod,           EButtonClickMethod::Type);
-	ue_py_slate_farguments_struct             ("border_background_color",   BorderBackgroundColor, FSlateColor);
-	ue_py_slate_farguments_struct             ("foreground_color",          ForegroundColor,       FSlateColor);
+	ue_py_slate_farguments_struct("border_background_color", BorderBackgroundColor, FSlateColor);
+	ue_py_slate_farguments_struct("foreground_color", ForegroundColor, FSlateColor);
     ue_py_slate_farguments_optional_bool      ("is_focusable",              IsFocusable);
     ue_py_slate_farguments_event              ("on_get_menu_content",       OnGetMenuContent,      FOnGetContent, OnGetMenuContent);
     ue_py_slate_farguments_optional_struct_ptr("unchecked_image",           UncheckedImage,           FSlateBrush);

diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySDockTab.cpp b/Source/UnrealEnginePython/Private/Slate/UEPySDockTab.cpp
@@ -25,6 +25,8 @@ static PyObject *py_ue_sdock_tab_set_label(ue_PySDockTab *self, PyObject * args)
 
 static PyObject *py_ue_sdock_tab_set_on_tab_closed(ue_PySButton *self, PyObject * args) 
 {
+    ue_py_slate_cast(SDockTab);
+
 	PyObject *py_callable;
 	if (!PyArg_ParseTuple(args, "O:set_on_tab_closed", &py_callable))
 	{
@@ -38,13 +40,14 @@ static PyObject *py_ue_sdock_tab_set_on_tab_closed(ue_PySButton *self, PyObject
 	TSharedRef<FPythonSlateDelegate> py_delegate = FUnrealEnginePythonHouseKeeper::Get()->NewStaticSlateDelegate(py_callable);
 	onTabClosed.BindSP(py_delegate, &FPythonSlateDelegate::OnTabClosed);
 
-	sw_dock_tab->SetOnTabClosed(onTabClosed);
+	py_SDockTab->SetOnTabClosed(onTabClosed);
 	Py_RETURN_NONE;
 }
 
-static PyObject *py_ue_sdock_tab_request_close_tab(ue_PySButton *self, PyObject * args) {
-
-	sw_dock_tab->RequestCloseTab();
+static PyObject *py_ue_sdock_tab_request_close_tab(ue_PySDockTab *self, PyObject * args)
+{
+	ue_py_slate_cast(SDockTab);
+	py_SDockTab->RequestCloseTab();
 
 	Py_RETURN_NONE;
 }
@@ -58,41 +61,42 @@ static PyObject *py_ue_sdock_tab_new_tab_manager(ue_PySDockTab *self, PyObject *
 }
 
 
-static PyObject *py_ue_sdock_tab_bring_to_front(ue_PySButton *self, PyObject * args) {
-
-	TSharedPtr<SWindow> parentWindow = sw_dock_tab->GetParentWindow();
+static PyObject *py_ue_sdock_tab_bring_to_front(ue_PySDockTab *self, PyObject * args)
+{
+    ue_py_slate_cast(SDockTab);
+	TSharedPtr<SWindow> parentWindow = py_SDockTab->GetParentWindow();
 	if (parentWindow.Get() != nullptr)
 	{
 		parentWindow->HACK_ForceToFront();
 	}
 	Py_RETURN_NONE;
 }
 
-static PyObject *py_ue_sdock_get_parent_window(ue_PySButton *self, PyObject * args) {
-
-	TSharedPtr<SWindow> ParentWindow = sw_dock_tab->GetParentWindow();
+static PyObject *py_ue_sdock_get_parent_window(ue_PySDockTab *self, PyObject * args)
+{
+    ue_py_slate_cast(SDockTab);
+	TSharedPtr<SWindow> ParentWindow = py_SDockTab->GetParentWindow();
 	if (ParentWindow.IsValid())
 	{
 		// Check to see if the widget exists already
 		ue_PySWidget *ret = ue_py_get_swidget(StaticCastSharedRef<SWidget>(ParentWindow.ToSharedRef()));
 		return (PyObject *)ret;
 	}
-	Py_INCREF(Py_None);
-	return Py_None;
+    Py_RETURN_NONE;
 }
 
-static PyObject *py_ue_sdock_get_docking_area(ue_PySButton *self, PyObject * args) {
-
-	TSharedPtr<SDockingArea> DockingArea = sw_dock_tab->GetDockArea();
+static PyObject *py_ue_sdock_get_docking_area(ue_PySDockTab *self, PyObject * args)
+{
+    ue_py_slate_cast(SDockTab);
+    TSharedPtr<SDockingArea> DockingArea = py_SDockTab->GetDockArea();
 	if (DockingArea.IsValid())
 	{
 		ue_PySWidget *ret = nullptr;
 		// Checks to see if the widget exists already, is added to mapping if not
 		ret = ue_py_get_swidget(StaticCastSharedRef<SWidget>(DockingArea.ToSharedRef()));
 		return (PyObject *)ret;
 	}
-	Py_INCREF(Py_None);
-	return Py_None;
+    Py_RETURN_NONE;
 }
 
 static PyMethodDef ue_PySDockTab_methods[] = {

diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySExpandableArea.cpp b/Source/UnrealEnginePython/Private/Slate/UEPySExpandableArea.cpp
@@ -4,26 +4,26 @@
 #include "UEPySExpandableArea.h"
 
 
-#define sw_expandable_area StaticCastSharedRef<SExpandableArea>(self->s_compound_widget.s_widget.s_widget)
-
-
-static PyObject *py_ue_sexpandable_area_is_expanded(ue_PySCheckBox *self, PyObject * args) {
-
-	if (sw_expandable_area->IsExpanded()) {
+static PyObject *py_ue_sexpandable_area_is_expanded(ue_PySCheckBox *self, PyObject * args) 
+{
+    ue_py_slate_cast(SExpandableArea);
+	if (py_SExpandableArea->IsExpanded()) {
 		Py_RETURN_TRUE;
 	}
 
 	Py_RETURN_FALSE;
 }
 
-static PyObject *py_ue_sexpandable_area_set_expanded(ue_PySCheckBox *self, PyObject * args) {
+static PyObject *py_ue_sexpandable_area_set_expanded(ue_PySCheckBox *self, PyObject * args) 
+{
+    ue_py_slate_cast(SExpandableArea);
 	PyObject *py_bool;
 	if (!PyArg_ParseTuple(args, "O:set_expanded", &py_bool))
 	{
 		return NULL;
 	}
 
-    sw_expandable_area->SetExpanded(PyObject_IsTrue(py_bool) ? true : false);
+    py_SExpandableArea->SetExpanded(PyObject_IsTrue(py_bool) ? true : false);
 
 	Py_RETURN_NONE;
 }
@@ -85,7 +85,7 @@ static int ue_py_sexpandable_area_init(ue_PySExpandableArea *self, PyObject *arg
     ue_py_slate_farguments_event              ("on_area_expansion_changed", OnAreaExpansionChanged, FOnBooleanValueChanged, OnBoolChanged);
     ue_py_slate_farguments_struct             ("area_title_font", AreaTitleFont, FSlateFontInfo);
 
-	ue_py_snew(SExpandableArea, s_compound_widget.s_widget);
+	ue_py_snew(SExpandableArea);
 	return 0;
 }
 

diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySExpanderArrow.cpp b/Source/UnrealEnginePython/Private/Slate/UEPySExpanderArrow.cpp
@@ -4,8 +4,6 @@
 #include "UEPySExpanderArrow.h"
 
 
-#define sw_expander_arrow StaticCastSharedRef<SExpanderArrow>(self->s_compound_widget.s_widget.s_widget)
-
 static PyMethodDef ue_PySExpanderArrow_methods[] = {
 	{ NULL }  /* Sentinel */
 };
@@ -68,7 +66,7 @@ static int ue_py_sexpander_arrow_init(ue_PySExpanderArrow *self, PyObject *args,
 	ue_py_slate_setup_farguments(SExpanderArrow);
     ue_py_slate_farguments_attribute_float("indent_amount", IndentAmount);
     ue_py_slate_farguments_attribute_int("base_indent_level", BaseIndentLevel);    
-    ue_py_snew_with_args(SExpanderArrow, s_compound_widget.s_widget, StaticCastSharedRef<SPythonMultiColumnTableRow>(py_owner_table_row->s_compound_widget.s_widget.s_widget));
+    ue_py_snew_with_args(SExpanderArrow, py_ue_is_swidget<SPythonMultiColumnTableRow>((PyObject*)py_owner_table_row).ToSharedRef());
 
     self->owner_row_py = py_owner_table_row;
     Py_INCREF(py_owner_table_row);    

diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySGraphPanel.cpp b/Source/UnrealEnginePython/Private/Slate/UEPySGraphPanel.cpp
@@ -4,11 +4,10 @@
 #if ENGINE_MINOR_VERSION > 15
 #include "UEPySGraphPanel.h"
 
-#define sw_graph_panel StaticCastSharedRef<SGraphPanel>(self->s_nodePanel.s_panel.s_widget)
-
 /*
 static PyObject *py_ue_sgraph_panel_add_slot(ue_PySGraphPanel* self, PyObject *args, PyObject *kwargs)
 {
+    ue_py_slate_cast(SGraphPanel);
 	PyObject *py_content;
 	int z_order = -1;
 	int h_align = 0;
@@ -41,9 +40,8 @@ static PyObject *py_ue_sgraph_panel_add_slot(ue_PySGraphPanel* self, PyObject *a
 	Py_INCREF(py_swidget);
 	self->s_nodePanel.s_panel.s_widget.py_swidget_slots.Add(py_swidget);
 
-	sw_graph_panel;
-
-	SOverlay::FOverlaySlot &fslot = sw_graph_panel->//sw_overlay->AddSlot(z_order);
+
+	SOverlay::FOverlaySlot &fslot = py_SGraphPanel->
 	fslot.AttachWidget(py_swidget->s_widget->AsShared());
 	fslot.HAlign((EHorizontalAlignment)h_align);
 	if (padding)

diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySHeaderRow.cpp b/Source/UnrealEnginePython/Private/Slate/UEPySHeaderRow.cpp
@@ -45,15 +45,6 @@ static PyObject *py_ue_sheader_row_add_column(ue_PySHeaderRow *self, PyObject *a
 
 		ue_py_slate_farguments_bool("should_generate_widget", ShouldGenerateWidget);
 
-		//sw_header_row->AddColumn(
-		//    SHeaderRow::Column(FName(UTF8_TO_TCHAR(column_id)))
-		//    .DefaultLabel(FText::FromString(UTF8_TO_TCHAR(default_label)))
-		//    .DefaultTooltip(FText::FromString(UTF8_TO_TCHAR(default_tooltip)))
-		//    .FixedWidth(fixed_width)
-		//    .HAlignCell((EHorizontalAlignment)cell_h_align)
-		//    .VAlignCell((EVerticalAlignment)cell_v_align)
-		//);
-
 		py_SHeaderRow->AddColumn(arguments);
 		return 0;
 	}();

diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySLevelViewport.cpp b/Source/UnrealEnginePython/Private/Slate/UEPySLevelViewport.cpp
@@ -77,7 +77,7 @@ static PyObject *py_ue_slevel_viewport_set_exposure_settings(ue_PySPythonEditorV
 /*
 PyObject *py_ue_spython_editor_viewport_simulate(ue_PySPythonEditorViewport *self, PyObject * args) {
 
-	sw_python_editor_viewport->GetViewportClient()->SetIsSimulateInEditorViewport(true);
+	py_SLevelViewport->GetViewportClient()->SetIsSimulateInEditorViewport(true);
 
 	Py_RETURN_NONE;
 

diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySListView.cpp b/Source/UnrealEnginePython/Private/Slate/UEPySListView.cpp
@@ -3,8 +3,6 @@
 
 #include "UEPySListView.h"
 
-#define sw_slist_view StaticCastSharedRef<SListView<TSharedPtr<FPythonItem>>>(self->s_table_view_base.s_compound_widget.s_widget.s_widget)
-
 static PyMethodDef ue_PySListView_methods[] = {
 	{ NULL }  /* Sentinel */
 };

diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySNumericEntryBox.cpp b/Source/UnrealEnginePython/Private/Slate/UEPySNumericEntryBox.cpp
@@ -4,7 +4,6 @@
 #include "UEPySNumericEntryBox.h"
 
 
-#define sw_float_numeric_entry_box StaticCastSharedRef<SNumericEntryBox<float>>(self->s_compound_widget.s_widget.s_widget)
 
 
 static PyMethodDef ue_PySNumericEntryBox_methods[] = {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,7 +6,6 @@
		#include "IStructureDetailsView.h"


		//#define sw_idetails_view StaticCastSharedRef<IDetailsView>(self->s_compound_widget.s_widget.s_widget)


		static PyObject ue_PyIStructureDetailsView_str(ue_PyIStructureDetailsView self)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,7 +4,6 @@
		#include "UEPySNumericEntryBox.h"


		#define sw_float_numeric_entry_box StaticCastSharedRef<SNumericEntryBox<float>>(self->s_compound_widget.s_widget.s_widget)


		static PyMethodDef ue_PySNumericEntryBox_methods[] = {
Expand Down