diff options
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_screen_types.h | 9 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 23 |
2 files changed, 27 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index 1f14bb58e78..ef0dbceef38 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -227,7 +227,7 @@ typedef struct uiPreview { /* some preview UI data need to be saved in } uiPreview; /* These two lines with # tell makesdna this struct can be excluded. - * Should be: #ifndef WITH_TOPBAR_WRITING */ + * Should be: #ifndef WITH_GLOBAL_AREA_WRITING */ # # typedef struct ScrGlobalAreaData { @@ -240,14 +240,21 @@ typedef struct ScrGlobalAreaData { * if they are 'collapsed' or not. Value is set on area creation and not * touched afterwards. */ short size_min, size_max; + short align; /* GlobalAreaAlign */ short flag; /* GlobalAreaFlag */ + short pad; } ScrGlobalAreaData; enum GlobalAreaFlag { GLOBAL_AREA_IS_HIDDEN = (1 << 0), }; +typedef enum GlobalAreaAlign { + GLOBAL_AREA_ALIGN_TOP, + GLOBAL_AREA_ALIGN_BOTTOM, +} GlobalAreaAlign; + typedef struct ScrArea_Runtime { struct bToolRef *tool; char is_tool_set; diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 588d90fae8d..3bc5118c996 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -67,9 +67,9 @@ struct MovieClipScopes; struct Mask; struct BLI_mempool; -/* TODO 2.8: We don't write the topbar to files currently. Uncomment this +/* TODO 2.8: We don't write the global areas to files currently. Uncomment * define to enable writing (should become the default in a bit). */ -//#define WITH_TOPBAR_WRITING +//#define WITH_GLOBAL_AREA_WRITING /* SpaceLink (Base) ==================================== */ @@ -1327,7 +1327,7 @@ typedef enum eSpaceClip_GPencil_Source { /* Top Bar ======================================= */ /* These two lines with # tell makesdna this struct can be excluded. - * Should be: #ifndef WITH_TOPBAR_WRITING */ + * Should be: #ifndef WITH_GLOBAL_AREA_WRITING */ # # typedef struct SpaceTopBar { @@ -1338,6 +1338,20 @@ typedef struct SpaceTopBar { int pad; } SpaceTopBar; +/* Status Bar ======================================= */ + +/* These two lines with # tell makesdna this struct can be excluded. + * Should be: #ifndef WITH_GLOBAL_AREA_WRITING */ +# +# +typedef struct SpaceStatusBar { + SpaceLink *next, *prev; + ListBase regionbase; /* storage of regions for inactive spaces */ + int spacetype; + + int pad; +} SpaceStatusBar; + /* **************** SPACE DEFINES ********************* */ @@ -1369,8 +1383,9 @@ typedef enum eSpace_Type { SPACE_USERPREF = 19, SPACE_CLIP = 20, SPACE_TOPBAR = 21, + SPACE_STATUSBAR = 22, - SPACE_TYPE_LAST = SPACE_TOPBAR + SPACE_TYPE_LAST = SPACE_STATUSBAR } eSpace_Type; /* use for function args */ |