diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2019-09-20 16:09:47 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2019-09-20 16:18:25 +0300 |
| commit | d1cc340e56691cb82e444289415ede24ba4d2bc0 (patch) | |
| tree | fa4dd87f4855bd80a95d176c6c46f010a33c9231 /source/blender/editors/space_file/file_intern.h | |
| parent | 7a83b64f7bd39934cf73dcca94598b610e829fb4 (diff) | |
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.
Diffstat (limited to 'source/blender/editors/space_file/file_intern.h')
| -rw-r--r-- | source/blender/editors/space_file/file_intern.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/space_file/file_intern.h b/source/blender/editors/space_file/file_intern.h index 4b86f38f8e4..701c28abfa2 100644 --- a/source/blender/editors/space_file/file_intern.h +++ b/source/blender/editors/space_file/file_intern.h @@ -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 */ |