[Bf-blender-cvs] [62059b465f6] functions: improve Pack List node UI

[Jacques Lucke]

Commit: 62059b465f6acf67065cabc80a5c665bfd0d9251
Author: Jacques Lucke
Date:   Mon Apr 1 10:32:54 2019 +0200
Branches: functions
https://developer.blender.org/rB62059b465f6acf67065cabc80a5c665bfd0d9251

improve Pack List node UI

===================================================================

M	release/scripts/startup/function_nodes/base.py
M	release/scripts/startup/function_nodes/declaration/base.py
M	release/scripts/startup/function_nodes/declaration/pack_list.py

===================================================================

diff --git a/release/scripts/startup/function_nodes/base.py b/release/scripts/startup/function_nodes/base.py
index 40eead97892..291b5ca64f7 100644
--- a/release/scripts/startup/function_nodes/base.py
+++ b/release/scripts/startup/function_nodes/base.py
@@ -207,8 +207,8 @@ class BaseSocket:
     def draw(self, context, layout, node, text):
         node.draw_socket(self, layout)
 
-    def draw_self(self, layout, node):
-        layout.label(text=self.name)
+    def draw_self(self, layout, node, text):
+        layout.label(text=text)
 
     def get_index(self, node):
         if self.is_output:
@@ -229,8 +229,7 @@ class DataSocket(BaseSocket):
     data_type: StringProperty(
         maxlen=64)
 
-    def draw_self(self, layout, node):
-        text = self.name
+    def draw_self(self, layout, node, text):
         if not (self.is_linked or self.is_output) and hasattr(self, "draw_property"):
             self.draw_property(layout, node, text)
         else:
diff --git a/release/scripts/startup/function_nodes/declaration/base.py b/release/scripts/startup/function_nodes/declaration/base.py
index 25e28dc35a5..7af4156b589 100644
--- a/release/scripts/startup/function_nodes/declaration/base.py
+++ b/release/scripts/startup/function_nodes/declaration/base.py
@@ -15,7 +15,7 @@ class SocketDeclBase:
         pass
 
     def draw_socket(self, layout, socket, index):
-        socket.draw_self(layout, self)
+        socket.draw_self(layout, self, socket.name)
 
     def operator_socket_call(self, own_socket, other_socket):
         pass
\ No newline at end of file
diff --git a/release/scripts/startup/function_nodes/declaration/pack_list.py b/release/scripts/startup/function_nodes/declaration/pack_list.py
index 2a358308a27..ffa6e76bfeb 100644
--- a/release/scripts/startup/function_nodes/declaration/pack_list.py
+++ b/release/scripts/startup/function_nodes/declaration/pack_list.py
@@ -57,13 +57,13 @@ class PackListDecl(SocketDeclBase):
 
     def draw_socket(self, layout, socket, index):
         if isinstance(socket, OperatorSocket):
-            props = layout.operator("fn.new_pack_list_input", text="New", emboss=False)
+            props = layout.operator("fn.new_pack_list_input", text="New Input", icon='ADD')
             props.tree_name = self.node.tree.name
             props.node_name = self.node.name
             props.prop_name = self.prop_name
         else:
             row = layout.row(align=True)
-            socket.draw_self(row, self.node)
+            socket.draw_self(row, self.node, str(index))
             props = row.operator("fn.remove_pack_list_input", text="", icon='X')
             props.tree_name = self.node.tree.name
             props.node_name = self.node.name