blender
/
blender
136
408
Fork 591
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

Fix #102591: Improvements to Context Menu Path Operators #113216

Merged
Harley Acheson merged 2 commits from Harley/blender:Fix102591 into blender-v4.0-release 2023-10-03 18:45:05 +02:00
Conversation 0 Commits 2 Files Changed 1 +18 -5
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/editors/interface/interface_context_menu.cc
View File

@ -15,6 +15,7 @@
#include "DNA_scene_types.h"
#include "DNA_screen_types.h"
#include "BLI_fileops.h"
#include "BLI_path_util.h"
#include "BLI_string.h"
#include "BLI_utildefines.h"
@ -429,7 +430,7 @@ static void ui_but_user_menu_add(bContext *C, uiBut *but, bUserMenu *um)
}
}
static void ui_but_menu_add_path_operators(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop)
static bool ui_but_menu_add_path_operators(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop)
{
const PropertySubType subtype = RNA_property_subtype(prop);
wmOperatorType *ot = WM_operatortype_find("WM_OT_path_open", true);
@ -442,9 +443,12 @@ static void ui_but_menu_add_path_operators(uiLayout *layout, PointerRNA *ptr, Pr
UNUSED_VARS_NDEBUG(subtype);
RNA_property_string_get(ptr, prop, filepath);
BLI_path_split_dir_file(filepath, dir, sizeof(dir), file, sizeof(file));
if (file[0]) {
if (!BLI_exists(filepath)) {
return false;
}
if (BLI_is_file(filepath)) {
BLI_assert(subtype == PROP_FILEPATH);
uiItemFullO_ptr(layout,
ot,
@ -456,6 +460,12 @@ static void ui_but_menu_add_path_operators(uiLayout *layout, PointerRNA *ptr, Pr
&props_ptr);
RNA_string_set(&props_ptr, "filepath", filepath);
}
else {
/* This is a directory, so ensure it ends in a slash. */
BLI_path_slash_ensure(filepath, ARRAY_SIZE(filepath));
}
BLI_path_split_dir_file(filepath, dir, sizeof(dir), file, sizeof(file));
uiItemFullO_ptr(layout,
ot,
@ -466,6 +476,8 @@ static void ui_but_menu_add_path_operators(uiLayout *layout, PointerRNA *ptr, Pr
UI_ITEM_NONE,
&props_ptr);
RNA_string_set(&props_ptr, "filepath", dir);
return true;
}
static void set_layout_context_from_button(bContext *C, uiLayout *layout, uiBut *but)
@ -932,8 +944,9 @@ bool ui_popup_context_menu_for_button(bContext *C, uiBut *but, const wmEvent *ev
uiItemS(layout);
if (type == PROP_STRING && ELEM(subtype, PROP_FILEPATH, PROP_DIRPATH)) {
ui_but_menu_add_path_operators(layout, ptr, prop);
uiItemS(layout);
if (ui_but_menu_add_path_operators(layout, ptr, prop)) {
uiItemS(layout);
}
}
}