diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-01-12 17:40:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-12 17:44:40 +0300 |
| commit | c6d28a94bee211c1d1ce41f364f5c026c4d759f0 (patch) | |
| tree | 67d0e83050c410184c47a878f2a113fb4bb3c11b /source/blender/makesdna/DNA_screen_types.h | |
| parent | 301433fe9d3864a454f0d27b9e3809e8e2c76da6 (diff) | |
Fix T42754: File-Selector lost on fullscreen exit
There was a hard-coded check to exit the fileselector when restoring a view.
Now, when space types differ, flag areas as temporary and switch back to the previous type only in this case.
This means you can select a file while having a file-selector space type open, and not loose it every time.
Diffstat (limited to 'source/blender/makesdna/DNA_screen_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_screen_types.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index 47a08c62f95..941a7d020bc 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -272,12 +272,16 @@ typedef struct ARegion { // #define WIN_EQUAL 3 // UNUSED /* area->flag */ -#define HEADER_NO_PULLDOWN (1 << 0) -#define AREA_FLAG_DRAWJOINTO (1 << 1) -#define AREA_FLAG_DRAWJOINFROM (1 << 2) -#define AREA_TEMP_INFO (1 << 3) -#define AREA_FLAG_DRAWSPLIT_H (1 << 4) -#define AREA_FLAG_DRAWSPLIT_V (1 << 5) +enum { + HEADER_NO_PULLDOWN = (1 << 0), + AREA_FLAG_DRAWJOINTO = (1 << 1), + AREA_FLAG_DRAWJOINFROM = (1 << 2), + AREA_TEMP_INFO = (1 << 3), + AREA_FLAG_DRAWSPLIT_H = (1 << 4), + AREA_FLAG_DRAWSPLIT_V = (1 << 5), + /* used to check if we should switch back to prevspace (of a different type) */ + AREA_FLAG_TEMP_TYPE = (1 << 6), +}; #define EDGEWIDTH 1 #define AREAGRID 4 |