UI: File Browser header consistency

Move "Recursion" and "Display Size" to a new View menu.

Thanks Campbell for helping with wonky menus.

1 files changed, 24 insertions, 13 deletions

diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py
index 2d45d11b423..9d903829bbb 100644
--- a/release/scripts/startup/bl_ui/space_filebrowser.py
+++ b/release/scripts/startup/bl_ui/space_filebrowser.py
@@ -18,7 +18,7 @@
 
 # <pep8 compliant>
 import bpy
-from bpy.types import Header, Panel, Menu
+from bpy.types import Header, Panel, Menu, UIList
 
 
 class FILEBROWSER_HT_header(Header):
@@ -33,8 +33,7 @@ class FILEBROWSER_HT_header(Header):
         if st.active_operator is None:
             layout.template_header()
 
-        row = layout.row()
-        row.separator()
+        layout.menu("FILEBROWSER_MT_view")
 
         row = layout.row(align=True)
         row.operator("file.previous", text="", icon='BACK')
@@ -42,10 +41,8 @@ class FILEBROWSER_HT_header(Header):
         row.operator("file.parent", text="", icon='FILE_PARENT')
         row.operator("file.refresh", text="", icon='FILE_REFRESH')
 
-        layout.separator()
         layout.operator_context = 'EXEC_DEFAULT'
         layout.operator("file.directory_new", icon='NEWFOLDER', text="")
-        layout.separator()
 
         layout.operator_context = 'INVOKE_DEFAULT'
 
@@ -53,20 +50,17 @@ class FILEBROWSER_HT_header(Header):
         if params:
             is_lib_browser = params.use_library_browsing
 
-            layout.prop(params, "recursion_level", text="")
-
             layout.prop(params, "display_type", expand=True, text="")
-
-            layout.prop(params, "display_size", text="")
-
             layout.prop(params, "sort_method", expand=True, text="")
-
             layout.prop(params, "show_hidden", text="", icon='FILE_HIDDEN')
+
+        layout.separator_spacer()
+
+        if params:
             layout.prop(params, "use_filter", text="", icon='FILTER')
 
             row = layout.row(align=True)
             row.active = params.use_filter
-
             row.prop(params, "use_filter_folder", text="")
 
             if params.filter_glob:
@@ -95,7 +89,7 @@ class FILEBROWSER_HT_header(Header):
         layout.template_running_jobs()
 
 
-class FILEBROWSER_UL_dir(bpy.types.UIList):
+class FILEBROWSER_UL_dir(UIList):
     def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
         direntry = item
         # space = context.space_data
@@ -248,6 +242,22 @@ class FILEBROWSER_PT_advanced_filter(Panel):
                 col.prop(params, "filter_id")
 
 
+class FILEBROWSER_MT_view(Menu):
+    bl_label = "View"
+
+    def draw(self, context):
+        layout = self.layout
+        st = context.space_data
+        params = st.params
+
+        layout.prop_menu_enum(params, "display_size")
+        layout.prop_menu_enum(params, "recursion_level")
+
+        layout.separator()
+
+        layout.menu("INFO_MT_area")
+
+
 classes = (
     FILEBROWSER_HT_header,
     FILEBROWSER_UL_dir,
@@ -257,6 +267,7 @@ classes = (
     FILEBROWSER_PT_bookmarks,
     FILEBROWSER_PT_recent_folders,
     FILEBROWSER_PT_advanced_filter,
+    FILEBROWSER_MT_view,
 )
 
 if __name__ == "__main__":  # only for live edit.