[Bf-blender-cvs] [1c7e0b1755e] functions: improve node layout of group nodes

[Jacques Lucke]

Commit: 1c7e0b1755ec0e875fa5e6b23ed2cf4e523ec6ff
Author: Jacques Lucke
Date:   Wed Dec 18 13:11:48 2019 +0100
Branches: functions
https://developer.blender.org/rB1c7e0b1755ec0e875fa5e6b23ed2cf4e523ec6ff

improve node layout of group nodes

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

M	release/scripts/startup/nodes/function_nodes/groups.py

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

diff --git a/release/scripts/startup/nodes/function_nodes/groups.py b/release/scripts/startup/nodes/function_nodes/groups.py
index 8165989b3bb..4662f6ac1cd 100644
--- a/release/scripts/startup/nodes/function_nodes/groups.py
+++ b/release/scripts/startup/nodes/function_nodes/groups.py
@@ -133,6 +133,7 @@ class GroupOutputNode(bpy.types.Node, BaseNode):
 class GroupNode(bpy.types.Node, FunctionNode):
     bl_idname = "fn_GroupNode"
     bl_label = "Group"
+    bl_icon = "NODETREE"
 
     node_group: PointerProperty(
         type=bpy.types.NodeTree,
@@ -171,12 +172,21 @@ class GroupNode(bpy.types.Node, FunctionNode):
                 assert False
 
     def draw(self, layout):
+        if self.node_group is None:
+            layout.scale_y = 1.3
+            self.invoke_group_selector(layout, "set_group", "Select Group", icon="NODETREE")
+
+    def draw_advanced(self, layout):
+        col = layout.column()
         text = "Select Group" if self.node_group is None else self.node_group.name
-        layout.scale_y = 1.3
-        self.invoke_group_selector(layout, "set_group", text, icon="NODETREE")
+        col.scale_y = 1.3
+        self.invoke_group_selector(col, "set_group", text, icon="NODETREE")
 
-    def draw_closed_label(self):
-        return self.node_group.name
+    def draw_label(self):
+        if self.node_group is None:
+            return "(G) -"
+        else:
+            return "(G) " + self.node_group.name
 
     def set_group(self, group):
         self.node_group = group