UI: Header consistency for animation editors

1 files changed, 18 insertions, 17 deletions

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'