blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Rewrite file region handling for non-editor mode 

This makes it so that regions only needed when the file browser is
invoked as an operation (e.g. Ctrl+O rather than a regular editor) are
lazy created then, and removed if the file browser is changed into a
regular editor then (e.g. Ctrl+O over regular file browser editor ->
Cancel).

That should remove some troublesome assumptions and makes versioning
redundant.
It also fixes the issue of an empty execute region at the bottom after
cancelling a file operation invoked from a regular file browser editor.
This commit is contained in:
Julian Eisel 2019-09-20 15:09:47 +02:00
parent 7a83b64f7b
commit d1cc340e56
4 changed files with 135 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/blenloader/intern/versioning_280.c
View File

@ -3877,19 +3877,6 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
}
}
else if (sl->spacetype == SPACE_FILE) {
ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
ARegion *ar_execute = do_versions_find_region_or_null(regionbase, RGN_TYPE_EXECUTE);
if (!ar_execute) {
ARegion *ar_main = do_versions_find_region(regionbase, RGN_TYPE_WINDOW);
ar_execute = MEM_callocN(sizeof(ARegion), "versioning execute region for file");
BLI_insertlinkbefore(regionbase, ar_main, ar_execute);
ar_execute->regiontype = RGN_TYPE_EXECUTE;
ar_execute->alignment = RGN_ALIGN_BOTTOM;
ar_execute->flag |= RGN_FLAG_DYNAMIC_SIZE;
}
}
}
}
}

7
source/blender/editors/space_file/file_intern.h
View File

@ -32,10 +32,6 @@ struct FileSelectParams;
struct SpaceFile;
struct View2D;
/* file_ops.c */
struct ARegion *file_tools_region(struct ScrArea *sa);
struct ARegion *file_tool_props_region(struct ScrArea *sa);
/* file_draw.c */
#define TILE_BORDER_X (UI_UNIT_X / 4)
#define TILE_BORDER_Y (UI_UNIT_Y / 4)
@ -112,6 +108,9 @@ void file_sfile_to_operator_ex(bContext *C,
struct SpaceFile *sfile,
char *filepath);
void file_sfile_to_operator(bContext *C, struct wmOperator *op, struct SpaceFile *sfile);
struct ARegion *file_tools_region_ensure(struct ScrArea *sa, struct ARegion *ar_prev);
void file_operator_to_sfile(bContext *C, struct SpaceFile *sfile, struct wmOperator *op);
/* filesel.c */

50
source/blender/editors/space_file/file_ops.c
View File

@ -2315,58 +2315,10 @@ void FILE_OT_hidedot(struct wmOperatorType *ot)
ot->poll = ED_operator_file_active; /* <- important, handler is on window level */
}
ARegion *file_tools_region(ScrArea *sa)
{
ARegion *ar, *arnew;
if ((ar = BKE_area_find_region_type(sa, RGN_TYPE_TOOLS)) != NULL) {
return ar;
}
/* add subdiv level; after header */
ar = BKE_area_find_region_type(sa, RGN_TYPE_HEADER);
/* is error! */
if (ar == NULL) {
return NULL;
}
arnew = MEM_callocN(sizeof(ARegion), "tools for file");
BLI_insertlinkafter(&sa->regionbase, ar, arnew);
arnew->regiontype = RGN_TYPE_TOOLS;
arnew->alignment = RGN_ALIGN_LEFT;
return arnew;
}
ARegion *file_tool_props_region(ScrArea *sa)
{
ARegion *ar, *arnew;
if ((ar = BKE_area_find_region_type(sa, RGN_TYPE_TOOL_PROPS)) != NULL) {
return ar;
}
/* add subdiv level; after execute region */
ar = BKE_area_find_region_type(sa, RGN_TYPE_EXECUTE);
/* is error! */
if (ar == NULL) {
return NULL;
}
arnew = MEM_callocN(sizeof(ARegion), "tool props for file");
BLI_insertlinkafter(&sa->regionbase, ar, arnew);
arnew->regiontype = RGN_TYPE_TOOL_PROPS;
arnew->alignment = RGN_ALIGN_RIGHT;
return arnew;
}
static int file_bookmark_toggle_exec(bContext *C, wmOperator *UNUSED(unused))
{
ScrArea *sa = CTX_wm_area(C);
ARegion *ar = file_tools_region(sa);
ARegion *ar = file_tools_region_ensure(sa, BKE_area_find_region_type(sa, RGN_TYPE_UI));
if (ar) {
ED_region_toggle_hidden(C, ar);

177
source/blender/editors/space_file/space_file.c
View File

@ -55,6 +55,80 @@
#include "filelist.h"
#include "GPU_framebuffer.h"
static ARegion *file_tools_region_create(ListBase *regionbase, ARegion *ar_prev)
{
ARegion *ar = MEM_callocN(sizeof(ARegion), "tools region for file");
BLI_insertlinkafter(regionbase, ar_prev, ar);
ar->regiontype = RGN_TYPE_TOOLS;
ar->alignment = RGN_ALIGN_LEFT;
return ar;
}
ARegion *file_tools_region_ensure(ScrArea *sa, ARegion *ar_prev)
{
ARegion *ar;
if ((ar = BKE_area_find_region_type(sa, RGN_TYPE_TOOLS)) != NULL) {
return ar;
}
return file_tools_region_create(&sa->regionbase, ar_prev);
}
static ARegion *file_tools_options_toggle_region_ensure(ScrArea *sa, ARegion *ar_prev)
{
ARegion *ar;
if ((ar = BKE_area_find_region_type(sa, RGN_TYPE_TOOLS)) != NULL && (ar->next != NULL) &&
(ar->next->regiontype == RGN_TYPE_TOOLS)) {
BLI_assert(ar->alignment == (RGN_ALIGN_BOTTOM | RGN_SPLIT_PREV));
return ar;
}
ar = MEM_callocN(sizeof(ARegion), "options toggle region for file");
BLI_insertlinkafter(&sa->regionbase, ar_prev, ar);
ar->regiontype = RGN_TYPE_TOOLS;
ar->alignment = RGN_ALIGN_BOTTOM | RGN_SPLIT_PREV;
ar->flag |= RGN_FLAG_DYNAMIC_SIZE;
return ar;
}
static ARegion *file_execute_region_ensure(ScrArea *sa, ARegion *ar_prev)
{
ARegion *ar;
if ((ar = BKE_area_find_region_type(sa, RGN_TYPE_EXECUTE)) != NULL) {
return ar;
}
ar = MEM_callocN(sizeof(ARegion), "execute region for file");
BLI_insertlinkafter(&sa->regionbase, ar_prev, ar);
ar->regiontype = RGN_TYPE_EXECUTE;
ar->alignment = RGN_ALIGN_BOTTOM;
ar->flag = RGN_FLAG_DYNAMIC_SIZE;
return ar;
}
static ARegion *file_tool_props_region_ensure(ScrArea *sa, ARegion *ar_prev)
{
ARegion *ar;
if ((ar = BKE_area_find_region_type(sa, RGN_TYPE_TOOL_PROPS)) != NULL) {
return ar;
}
/* add subdiv level; after execute region */
ar = MEM_callocN(sizeof(ARegion), "tool props for file");
BLI_insertlinkafter(&sa->regionbase, ar_prev, ar);
ar->regiontype = RGN_TYPE_TOOL_PROPS;
ar->alignment = RGN_ALIGN_RIGHT;
return ar;
}
/* ******************** default callbacks for file space ***************** */
static SpaceLink *file_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scene))
@ -80,32 +154,9 @@ static SpaceLink *file_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scen
ar->flag |= RGN_FLAG_DYNAMIC_SIZE;
/* Tools region */
ar = MEM_callocN(sizeof(ARegion), "tools region for file");
BLI_addtail(&sfile->regionbase, ar);
ar->regiontype = RGN_TYPE_TOOLS;
ar->alignment = RGN_ALIGN_LEFT;
/* Tools region (lower split region) */
ar = MEM_callocN(sizeof(ARegion), "lower tools region for file");
BLI_addtail(&sfile->regionbase, ar);
ar->regiontype = RGN_TYPE_TOOLS;
ar->alignment = RGN_ALIGN_BOTTOM | RGN_SPLIT_PREV;
ar->flag |= RGN_FLAG_DYNAMIC_SIZE;
file_tools_region_create(&sfile->regionbase, ar);
/* Execute region */
ar = MEM_callocN(sizeof(ARegion), "execute region for file");
BLI_addtail(&sfile->regionbase, ar);
ar->regiontype = RGN_TYPE_EXECUTE;
ar->alignment = RGN_ALIGN_BOTTOM;
ar->flag |= RGN_FLAG_DYNAMIC_SIZE;
/* Tool props region is added as needed. */
#if 0
/* Tool props (aka operator) region */
ar = MEM_callocN(sizeof(ARegion), "tool props region for file");
BLI_addtail(&sfile->regionbase, ar);
ar->regiontype = RGN_TYPE_TOOL_PROPS;
ar->alignment = RGN_ALIGN_RIGHT;
#endif
/* Options toggle, tool props and execute region are added as needed, see file_refresh(). */
/* main region */
ar = MEM_callocN(sizeof(ARegion), "main region for file");
@ -218,6 +269,59 @@ static SpaceLink *file_duplicate(SpaceLink *sl)
return (SpaceLink *)sfilen;
}
static void file_ensure_valid_region_state(bContext *C,
wmWindowManager *wm,
wmWindow *win,
ScrArea *sa,
SpaceFile *sfile,
FileSelectParams *params)
{
ARegion *ar_ui = BKE_area_find_region_type(sa, RGN_TYPE_UI);
ARegion *ar_tools_upper = BKE_area_find_region_type(sa, RGN_TYPE_TOOLS);
ARegion *ar_props = BKE_area_find_region_type(sa, RGN_TYPE_TOOL_PROPS);
ARegion *ar_execute = BKE_area_find_region_type(sa, RGN_TYPE_EXECUTE);
ARegion *ar_tools_lower;
bool needs_init = false; /* To avoid multiple ED_area_initialize() calls. */
if (ar_tools_upper == NULL) {
ar_tools_upper = file_tools_region_ensure(sa, ar_ui);
needs_init = true;
}
/* If there's an file-operation, ensure we have the option and execute region */
if (sfile->op && (ar_props == NULL)) {
ar_tools_lower = file_tools_options_toggle_region_ensure(sa, ar_tools_upper);
ar_execute = file_execute_region_ensure(sa, ar_tools_lower);
ar_props = file_tool_props_region_ensure(sa, ar_execute);
if (params->flag & FILE_HIDE_TOOL_PROPS) {
ar_props->flag |= RGN_FLAG_HIDDEN;
}
else {
ar_props->flag &= ~RGN_FLAG_HIDDEN;
}
needs_init = true;
}
/* If there's _no_ file-operation, ensure we _don't_ have the option and execute region */
else if ((sfile->op == NULL) && (ar_props != NULL)) {
ar_tools_lower = ar_tools_upper->next;
BLI_assert(ar_execute != NULL);
BLI_assert(ar_tools_lower != NULL);
BLI_assert(ar_tools_lower->regiontype == RGN_TYPE_TOOLS);
ED_region_remove(C, sa, ar_props);
ED_region_remove(C, sa, ar_execute);
ED_region_remove(C, sa, ar_tools_lower);
needs_init = true;
}
if (needs_init) {
ED_area_initialize(wm, win, sa);
}
}
static void file_refresh(const bContext *C, ScrArea *sa)
{
wmWindowManager *wm = CTX_wm_manager(C);
@ -225,7 +329,6 @@ static void file_refresh(const bContext *C, ScrArea *sa)
SpaceFile *sfile = CTX_wm_space_file(C);
FileSelectParams *params = ED_fileselect_get_params(sfile);
struct FSMenu *fsmenu = ED_fsmenu_get();
ARegion *region_tool_props = BKE_area_find_region_type(sa, RGN_TYPE_TOOL_PROPS);
if (!sfile->folders_prev) {
sfile->folders_prev = folderlist_new();
@ -288,26 +391,8 @@ static void file_refresh(const bContext *C, ScrArea *sa)
}
/* Might be called with NULL sa, see file_main_region_draw() below. */
if (sa && BKE_area_find_region_type(sa, RGN_TYPE_TOOLS) == NULL) {
/* Create TOOLS region. */
file_tools_region(sa);
ED_area_initialize(wm, win, sa);
}
/* If there's an file-operation, ensure we have the option region */
if (sa && sfile->op && (region_tool_props == NULL)) {
ARegion *region_props = file_tool_props_region(sa);
if (params->flag & FILE_HIDE_TOOL_PROPS) {
region_props->flag |= RGN_FLAG_HIDDEN;
}
ED_area_initialize(wm, win, sa);
}
/* If there's _no_ file-operation, ensure we _don't_ have the option region */
else if (sa && (sfile->op == NULL) && (region_tool_props != NULL)) {
ED_region_remove((bContext *)C, sa, region_tool_props);
if (sa) {
file_ensure_valid_region_state((bContext *)C, wm, win, sa, sfile, params);
}
ED_area_tag_redraw(sa);