[Bf-extensions-cvs] [95284b8f] master: Rigify: improve the layer selection UI layout for narrow properties panel.

[Alexander Gavrilov]

Commit: 95284b8fa217def9dddd9d05541724e2ac61be5a
Author: Alexander Gavrilov
Date:   Wed Oct 16 13:31:50 2019 +0300
Branches: master
https://developer.blender.org/rBA95284b8fa217def9dddd9d05541724e2ac61be5a

Rigify: improve the layer selection UI layout for narrow properties panel.

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

M	rigify/rigs/spines/basic_spine.py
M	rigify/utils/layers.py

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

diff --git a/rigify/rigs/spines/basic_spine.py b/rigify/rigs/spines/basic_spine.py
index 00ba2f4f..09d9b5d2 100644
--- a/rigify/rigs/spines/basic_spine.py
+++ b/rigify/rigs/spines/basic_spine.py
@@ -305,9 +305,8 @@ class Rig(BaseSpineRig):
 
         layout.prop(params, 'make_fk_controls')
 
-        col = layout.column()
-        col.active = params.make_fk_controls
-        ControlLayersOption.FK.parameters_ui(col, params)
+        if params.make_fk_controls:
+            ControlLayersOption.FK.parameters_ui(layout, params)
 
 
 def create_sample(obj):
diff --git a/rigify/utils/layers.py b/rigify/utils/layers.py
index 7a1bcef8..0cbd41f8 100644
--- a/rigify/utils/layers.py
+++ b/rigify/utils/layers.py
@@ -71,7 +71,7 @@ class ControlLayersOption:
 
         self.toggle_option = self.name+'_layers_extra'
         self.layers_option = self.name+'_layers'
-        self.toggle_name = toggle_name if toggle_name else self.toggle_option
+        self.toggle_name = toggle_name if toggle_name else "Assign " + self.name.title() + " Layers"
 
     def get(self, params):
         if getattr(params, self.toggle_option):
@@ -122,10 +122,15 @@ class ControlLayersOption:
         setattr(params, self.layers_option, prop_layers)
 
     def parameters_ui(self, layout, params):
-        r = layout.row()
-        r.prop(params, self.toggle_option)
-        r.active = getattr(params, self.toggle_option)
+        box = layout.box()
+        box.prop(params, self.toggle_option)
 
+        active = getattr(params, self.toggle_option)
+
+        if not active:
+            return
+
+        r = box.row()
         col = r.column(align=True)
         row = col.row(align=True)