[Bf-blender-cvs] [03d2dcec7da] filebrowser_redesign: Move sorting options into filter popup

[Julian Eisel]

Commit: 03d2dcec7daf2291b016cf928371a9fc8c2fc002
Author: Julian Eisel
Date:   Sun Jul 21 14:46:45 2019 +0200
Branches: filebrowser_redesign
https://developer.blender.org/rB03d2dcec7daf2291b016cf928371a9fc8c2fc002

Move sorting options into filter popup

Consistent to Outliner filter popup.

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

M	release/scripts/startup/bl_ui/space_filebrowser.py

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

diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py
index 0783d416c65..494fd8b8c80 100644
--- a/release/scripts/startup/bl_ui/space_filebrowser.py
+++ b/release/scripts/startup/bl_ui/space_filebrowser.py
@@ -34,17 +34,6 @@ class FILEBROWSER_HT_header(Header):
 
         layout.menu("FILEBROWSER_MT_view")
 
-        layout.operator_context = 'EXEC_DEFAULT'
-
-        layout.operator_context = 'INVOKE_DEFAULT'
-
-        # can be None when save/reload with a file selector open
-        if params:
-            is_lib_browser = params.use_library_browsing
-
-            layout.prop(params, "sort_method", expand=True, text="")
-            layout.prop(params, "show_hidden", text="", icon='FILE_HIDDEN')
-
         layout.separator_spacer()
 
         layout.template_running_jobs()
@@ -61,7 +50,19 @@ class FILEBROWSER_PT_filter(Panel):
 
         space = context.space_data
         params = space.params
-        is_lib_browser = params.use_library_browsing
+
+        # can be None when save/reload with a file selector open
+        if params:
+            is_lib_browser = params.use_library_browsing
+
+            layout.label(text="Sort By:")
+            layout.prop(params, "sort_method", expand=True, text="")
+
+            layout.separator()
+
+            layout.prop(params, "show_hidden")
+
+            layout.separator()
 
         row = layout.row(align=True)
         row.prop(params, "use_filter", text="", toggle=0)
@@ -312,7 +313,6 @@ class FILEBROWSER_PT_directory_path(Panel):
         subrow.operator("file.directory_new", icon='NEWFOLDER', text="")
 
 
-
 class FILEBROWSER_PT_file_operation(Panel):
     bl_space_type = 'FILE_BROWSER'
     bl_region_type = 'EXECUTE'