archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix menu search expanding file browser menus

Browse Source
This commit is contained in:
Campbell Barton
2020-05-07 12:27:10 +10:00
parent 1dced6d814
commit b1374a8ce9
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
release/scripts/startup/bl_ui/space_filebrowser.py
View File

@@ -20,6 +20,7 @@
from bpy.types import Header, Panel, Menu, UIList from bpy.types import Header, Panel, Menu, UIList
class FILEBROWSER_HT_header(Header): class FILEBROWSER_HT_header(Header):
bl_space_type = 'FILE_BROWSER' bl_space_type = 'FILE_BROWSER'
@@ -31,8 +32,7 @@ class FILEBROWSER_HT_header(Header):
if st.active_operator is None: if st.active_operator is None:
layout.template_header() layout.template_header()
layout.menu("FILEBROWSER_MT_view") FILEBROWSER_MT_editor_menus.draw_collapsible(context, layout)
layout.menu("FILEBROWSER_MT_select")
# can be None when save/reload with a file selector open # can be None when save/reload with a file selector open
@@ -411,6 +411,17 @@ class FILEBROWSER_PT_directory_path(Panel):
).region_type = 'TOOL_PROPS' ).region_type = 'TOOL_PROPS'
class FILEBROWSER_MT_editor_menus(Menu):
bl_idname = "FILEBROWSER_MT_editor_menus"
bl_label = ""
def draw(self, _context):
layout = self.layout
layout.menu("FILEBROWSER_MT_view")
layout.menu("FILEBROWSER_MT_select")
class FILEBROWSER_MT_view(Menu): class FILEBROWSER_MT_view(Menu):
bl_label = "View" bl_label = "View"
@@ -502,6 +513,7 @@ classes = (
FILEBROWSER_PT_bookmarks_recents, FILEBROWSER_PT_bookmarks_recents,
FILEBROWSER_PT_advanced_filter, FILEBROWSER_PT_advanced_filter,
FILEBROWSER_PT_directory_path, FILEBROWSER_PT_directory_path,
FILEBROWSER_MT_editor_menus,
FILEBROWSER_MT_view, FILEBROWSER_MT_view,
FILEBROWSER_MT_select, FILEBROWSER_MT_select,
FILEBROWSER_MT_context_menu, FILEBROWSER_MT_context_menu,

2
source/blender/editors/interface/interface_template_search_menu.c
View File

@@ -497,7 +497,7 @@ static struct MenuSearch_Data *menu_items_from_ui_create(
SPACE_MENU_MAP(SPACE_GRAPH, "GRAPH_MT_editor_menus"); SPACE_MENU_MAP(SPACE_GRAPH, "GRAPH_MT_editor_menus");
SPACE_MENU_MAP(SPACE_OUTLINER, "OUTLINER_MT_editor_menus"); SPACE_MENU_MAP(SPACE_OUTLINER, "OUTLINER_MT_editor_menus");
SPACE_MENU_NOP(SPACE_PROPERTIES); SPACE_MENU_NOP(SPACE_PROPERTIES);
SPACE_MENU_MAP(SPACE_FILE, "FILE_MT_editor_menus"); SPACE_MENU_MAP(SPACE_FILE, "FILEBROWSER_MT_editor_menus");
SPACE_MENU_MAP(SPACE_IMAGE, "IMAGE_MT_editor_menus"); SPACE_MENU_MAP(SPACE_IMAGE, "IMAGE_MT_editor_menus");
SPACE_MENU_MAP(SPACE_INFO, "INFO_MT_editor_menus"); SPACE_MENU_MAP(SPACE_INFO, "INFO_MT_editor_menus");
SPACE_MENU_MAP(SPACE_SEQ, "SEQUENCER_MT_editor_menus"); SPACE_MENU_MAP(SPACE_SEQ, "SEQUENCER_MT_editor_menus");