[Bf-blender-cvs] [c1da8d8986a] master: UI: Use better flow layout

William Reynish noreply at git.blender.org
Thu Mar 21 18:53:54 CET 2019


Commit: c1da8d8986a26d33e0576e23b1e7fc69bacc69a8
Author: William Reynish
Date:   Thu Mar 21 18:25:01 2019 +0100
Branches: master
https://developer.blender.org/rBc1da8d8986a26d33e0576e23b1e7fc69bacc69a8

UI: Use better flow layout

Flow layout needs columns defined to work properly

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

M	release/scripts/startup/bl_ui/properties_data_armature.py
M	release/scripts/startup/bl_ui/properties_data_camera.py

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

diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py
index 2fa076c3794..e80f104b393 100644
--- a/release/scripts/startup/bl_ui/properties_data_armature.py
+++ b/release/scripts/startup/bl_ui/properties_data_armature.py
@@ -84,13 +84,19 @@ class DATA_PT_display(ArmatureButtonsPanel, Panel):
         layout.prop(arm, "display_type", text="Display As")
 
         flow = layout.grid_flow(row_major=False, columns=0, even_columns=False, even_rows=False, align=True)
-        flow.prop(arm, "show_names", text="Names")
-        flow.prop(arm, "show_axes", text="Axes")
-        flow.prop(arm, "show_bone_custom_shapes", text="Shapes")
-        flow.prop(arm, "show_group_colors", text="Group Colors")
+        col = flow.column()
+        col.prop(arm, "show_names", text="Names")
+        col = flow.column()
+        col.prop(arm, "show_axes", text="Axes")
+        col = flow.column()
+        col.prop(arm, "show_bone_custom_shapes", text="Shapes")
+        col = flow.column()
+        col.prop(arm, "show_group_colors", text="Group Colors")
         if ob:
-            flow.prop(ob, "show_in_front", text="In Front")
-        flow.prop(arm, "use_deform_delay", text="Delay Refresh")
+            col = flow.column()
+            col.prop(ob, "show_in_front", text="In Front")
+        col = flow.column()
+        col.prop(arm, "use_deform_delay", text="Delay Refresh")
 
 
 class DATA_MT_bone_group_context_menu(Menu):
diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py
index 820630a7427..ea18298c44c 100644
--- a/release/scripts/startup/bl_ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@ -400,14 +400,22 @@ class DATA_PT_camera_display_composition_guides(CameraButtonsPanel, Panel):
 
         flow = layout.grid_flow(row_major=False, columns=0, even_columns=False, even_rows=False, align=False)
 
-        flow.prop(cam, "show_composition_center")
-        flow.prop(cam, "show_composition_center_diagonal")
-        flow.prop(cam, "show_composition_thirds")
-        flow.prop(cam, "show_composition_golden")
-        flow.prop(cam, "show_composition_golden_tria_a")
-        flow.prop(cam, "show_composition_golden_tria_b")
-        flow.prop(cam, "show_composition_harmony_tri_a")
-        flow.prop(cam, "show_composition_harmony_tri_b")
+        col = flow.column()
+        col.prop(cam, "show_composition_center")
+        col = flow.column()
+        col.prop(cam, "show_composition_center_diagonal")
+        col = flow.column()
+        col.prop(cam, "show_composition_thirds")
+        col = flow.column()
+        col.prop(cam, "show_composition_golden")
+        col = flow.column()
+        col.prop(cam, "show_composition_golden_tria_a")
+        col = flow.column()
+        col.prop(cam, "show_composition_golden_tria_b")
+        col = flow.column()
+        col.prop(cam, "show_composition_harmony_tri_a")
+        col = flow.column()
+        col.prop(cam, "show_composition_harmony_tri_b")
 
 
 class DATA_PT_camera_display_passepartout(CameraButtonsPanel, Panel):



More information about the Bf-blender-cvs mailing list