[Bf-blender-cvs] [5b7f0d36f35] blender2.8: UI: Header consistency for animation editors

Pablo Vazquez noreply at git.blender.org
Mon Jul 2 14:57:21 CEST 2018


Commit: 5b7f0d36f3532265f562625d121dcc05c937b9dc
Author: Pablo Vazquez
Date:   Mon Jul 2 14:45:55 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB5b7f0d36f3532265f562625d121dcc05c937b9dc

UI: Header consistency for animation editors

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

M	release/scripts/startup/bl_ui/space_dopesheet.py
M	release/scripts/startup/bl_ui/space_graph.py
M	release/scripts/startup/bl_ui/space_nla.py
M	release/scripts/startup/bl_ui/space_time.py

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

diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index 22c1f17217e..f245fc92a8f 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -262,6 +262,10 @@ class DOPESHEET_HT_editor_buttons(Header):
             row = layout.row(align=True)
             row.prop(st.dopesheet, "filter_text", text="")
 
+        # Grease Pencil mode doesn't need snapping, as it's frame-aligned only
+        if st.mode != 'GPENCIL':
+            layout.prop(st, "auto_snap", text="")
+
         layout.popover(
             space_type='DOPESHEET_EDITOR',
             region_type='HEADER',
@@ -270,17 +274,12 @@ class DOPESHEET_HT_editor_buttons(Header):
             icon='FILTER',
         )
 
-        layout.separator()
-
         row = layout.row(align=True)
         row.prop(toolsettings, "use_proportional_action", text="", icon_only=True)
         sub = row.row(align=True)
         sub.active = toolsettings.use_proportional_action
         sub.prop(toolsettings, "proportional_edit_falloff", text="", icon_only=True)
 
-        # Grease Pencil mode doesn't need snapping, as it's frame-aligned only
-        if st.mode != 'GPENCIL':
-            layout.prop(st, "auto_snap", text="")
 
         row = layout.row(align=True)
         row.operator("action.copy", text="", icon='COPYDOWN')
diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py
index e3ebb99d859..f7e3357e1bc 100644
--- a/release/scripts/startup/bl_ui/space_graph.py
+++ b/release/scripts/startup/bl_ui/space_graph.py
@@ -41,18 +41,8 @@ class GRAPH_HT_header(Header):
         # Now a exposed as a sub-space type
         # layout.prop(st, "mode", text="")
 
-        layout.popover(
-            space_type='GRAPH_EDITOR',
-            region_type='HEADER',
-            panel_type="GRAPH_PT_filters",
-            text="",
-            icon='FILTER',
-        )
-
         GRAPH_MT_editor_menus.draw_collapsible(context, layout)
 
-        dopesheet_filter(layout, context)
-
         row = layout.row(align=True)
         row.prop(st, "use_normalization", icon='NORMALIZE_FCURVES', text="Normalize", toggle=True)
         sub = row.row(align=True)
@@ -61,13 +51,30 @@ class GRAPH_HT_header(Header):
 
         layout.separator_spacer()
 
+        dopesheet_filter(layout, context)
+
+        row = layout.row(align=True)
+        if st.has_ghost_curves:
+            row.operator("graph.ghost_curves_clear", text="", icon='GHOST_DISABLED')
+        else:
+            row.operator("graph.ghost_curves_create", text="", icon='GHOST_ENABLED')
+
+        layout.prop(st, "auto_snap", text="")
+
+        layout.popover(
+            space_type='GRAPH_EDITOR',
+            region_type='HEADER',
+            panel_type="GRAPH_PT_filters",
+            text="",
+            icon='FILTER',
+        )
+
         row = layout.row(align=True)
         row.prop(toolsettings, "use_proportional_fcurve", text="", icon_only=True)
         sub = row.row(align=True)
         sub.active = toolsettings.use_proportional_fcurve
         sub.prop(toolsettings, "proportional_edit_falloff", text="", icon_only=True)
 
-        layout.prop(st, "auto_snap", text="")
         layout.prop(st, "pivot_point", icon_only=True)
 
         row = layout.row(align=True)
@@ -75,12 +82,6 @@ class GRAPH_HT_header(Header):
         row.operator("graph.paste", text="", icon='PASTEDOWN')
         row.operator("graph.paste", text="", icon='PASTEFLIPDOWN').flipped = True
 
-        row = layout.row(align=True)
-        if st.has_ghost_curves:
-            row.operator("graph.ghost_curves_clear", text="", icon='GHOST_DISABLED')
-        else:
-            row.operator("graph.ghost_curves_create", text="", icon='GHOST_ENABLED')
-
 
 class GRAPH_PT_filters(DopesheetFilterPopoverBase, Panel):
     bl_space_type = 'GRAPH_EDITOR'
diff --git a/release/scripts/startup/bl_ui/space_nla.py b/release/scripts/startup/bl_ui/space_nla.py
index 9a5f835d505..d85f7711c1a 100644
--- a/release/scripts/startup/bl_ui/space_nla.py
+++ b/release/scripts/startup/bl_ui/space_nla.py
@@ -37,6 +37,14 @@ class NLA_HT_header(Header):
         row = layout.row(align=True)
         row.template_header()
 
+        NLA_MT_editor_menus.draw_collapsible(context, layout)
+
+        layout.separator_spacer()
+
+        dopesheet_filter(layout, context)
+
+        layout.prop(st, "auto_snap", text="")
+
         layout.popover(
             space_type='NLA_EDITOR',
             region_type='HEADER',
@@ -45,13 +53,6 @@ class NLA_HT_header(Header):
             icon='FILTER',
         )
 
-        NLA_MT_editor_menus.draw_collapsible(context, layout)
-
-        dopesheet_filter(layout, context)
-
-        layout.separator_spacer()
-        layout.prop(st, "auto_snap", text="")
-
 
 class NLA_PT_filters(DopesheetFilterPopoverBase, Panel):
     bl_space_type = 'NLA_EDITOR'
diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py
index 4616aeb45a4..179f1c90d2e 100644
--- a/release/scripts/startup/bl_ui/space_time.py
+++ b/release/scripts/startup/bl_ui/space_time.py
@@ -38,9 +38,9 @@ class TIME_HT_editor_buttons(Header):
 
         layout.separator_spacer()
 
-        row = layout.row(align=True)
-        row.prop(toolsettings, "use_keyframe_insert_auto", text="", toggle=True)
+        layout.prop(toolsettings, "use_keyframe_insert_auto", text="", toggle=True)
 
+        row = layout.row(align=True)
         row.operator("screen.frame_jump", text="", icon='REW').end = False
         row.operator("screen.keyframe_jump", text="", icon='PREV_KEYFRAME').next = False
         if not screen.is_animation_playing:



More information about the Bf-blender-cvs mailing list