Cleanup: move flag definition into screen header
This has been moved to screen, move declaration as well.
This commit is contained in:
parent
ae2b677dcb
commit
203b964ff4
|
|
@ -65,10 +65,7 @@ typedef struct bScreen {
|
|||
short flag;
|
||||
/** Winid from WM, starts with 1. */
|
||||
short winid;
|
||||
/**
|
||||
* User-setting for which editors get redrawn during anim playback
|
||||
* (used to be time->redraws).
|
||||
*/
|
||||
/** User-setting for which editors get redrawn during anim playback. */
|
||||
short redraws_flag;
|
||||
|
||||
/** Temp screen in a temp window, don't save (like user prefs). */
|
||||
|
|
@ -265,7 +262,8 @@ typedef struct TransformOrientation {
|
|||
int pad;
|
||||
} TransformOrientation;
|
||||
|
||||
typedef struct uiPreview { /* some preview UI data need to be saved in file */
|
||||
/** Some preview UI data need to be saved in file. */
|
||||
typedef struct uiPreview {
|
||||
struct uiPreview *next, *prev;
|
||||
|
||||
/** Defined as UI_MAX_NAME_STR. */
|
||||
|
|
@ -449,7 +447,7 @@ typedef struct ARegion {
|
|||
ARegion_Runtime runtime;
|
||||
} ARegion;
|
||||
|
||||
/* area->flag */
|
||||
/** #ScrArea.flag */
|
||||
enum {
|
||||
HEADER_NO_PULLDOWN = (1 << 0),
|
||||
// AREA_FLAG_DEPRECATED_1 = (1 << 1),
|
||||
|
|
@ -474,20 +472,36 @@ enum {
|
|||
#define AREAMINX 32
|
||||
#define HEADERY 26
|
||||
|
||||
/* screen->flag */
|
||||
/** #bScreen.flag */
|
||||
enum {
|
||||
SCREEN_COLLAPSE_TOPBAR = 1,
|
||||
SCREEN_COLLAPSE_STATUSBAR = 2,
|
||||
};
|
||||
|
||||
/* screen->state */
|
||||
/** #bScreen.state */
|
||||
enum {
|
||||
SCREENNORMAL = 0,
|
||||
SCREENMAXIMIZED = 1, /* one editor taking over the screen */
|
||||
SCREENFULL = 2, /* one editor taking over the screen with no bare-minimum UI elements */
|
||||
};
|
||||
|
||||
/* Panel->flag */
|
||||
/** #bScreen.redraws_flag */
|
||||
typedef enum eScreen_Redraws_Flag {
|
||||
TIME_REGION = (1 << 0),
|
||||
TIME_ALL_3D_WIN = (1 << 1),
|
||||
TIME_ALL_ANIM_WIN = (1 << 2),
|
||||
TIME_ALL_BUTS_WIN = (1 << 3),
|
||||
// TIME_WITH_SEQ_AUDIO = (1 << 4), /* DEPRECATED */
|
||||
TIME_SEQ = (1 << 5),
|
||||
TIME_ALL_IMAGE_WIN = (1 << 6),
|
||||
// TIME_CONTINUE_PHYSICS = (1 << 7), /* UNUSED */
|
||||
TIME_NODES = (1 << 8),
|
||||
TIME_CLIPS = (1 << 9),
|
||||
|
||||
TIME_FOLLOW = (1 << 15),
|
||||
} eScreen_Redraws_Flag;
|
||||
|
||||
/** #Panel.flag */
|
||||
enum {
|
||||
PNL_SELECT = (1 << 0),
|
||||
PNL_CLOSEDX = (1 << 1),
|
||||
|
|
@ -499,7 +513,7 @@ enum {
|
|||
PNL_POPOVER = (1 << 6),
|
||||
};
|
||||
|
||||
/* Panel->snap - for snapping to screen edges */
|
||||
/** #Panel.snap - for snapping to screen edges */
|
||||
#define PNL_SNAP_NONE 0
|
||||
/* #define PNL_SNAP_TOP 1 */
|
||||
/* #define PNL_SNAP_RIGHT 2 */
|
||||
|
|
@ -516,16 +530,17 @@ enum {
|
|||
/* Fallback panel category (only for old scripts which need updating) */
|
||||
#define PNL_CATEGORY_FALLBACK "Misc"
|
||||
|
||||
/* uiList layout_type */
|
||||
/** #uiList.layout_type */
|
||||
enum {
|
||||
UILST_LAYOUT_DEFAULT = 0,
|
||||
UILST_LAYOUT_COMPACT = 1,
|
||||
UILST_LAYOUT_GRID = 2,
|
||||
};
|
||||
|
||||
/* uiList flag */
|
||||
/** #uiList.flag */
|
||||
enum {
|
||||
UILST_SCROLL_TO_ACTIVE_ITEM = 1 << 0, /* Scroll list to make active item visible. */
|
||||
/* Scroll list to make active item visible. */
|
||||
UILST_SCROLL_TO_ACTIVE_ITEM = 1 << 0,
|
||||
};
|
||||
|
||||
/* Value (in number of items) we have to go below minimum shown items to enable auto size. */
|
||||
|
|
@ -538,13 +553,13 @@ enum {
|
|||
UILST_FLT_ITEM = 1 << 30, /* This item has passed the filter process successfully. */
|
||||
};
|
||||
|
||||
/* uiList filter options */
|
||||
/** #uiList.filter_flag */
|
||||
enum {
|
||||
UILST_FLT_SHOW = 1 << 0, /* Show filtering UI. */
|
||||
UILST_FLT_EXCLUDE = UILST_FLT_ITEM, /* Exclude filtered items, *must* use this same value. */
|
||||
};
|
||||
|
||||
/* uiList filter sort type */
|
||||
/** #uiList.filter_sort_flag */
|
||||
enum {
|
||||
/* Plain values (only one is valid at a time, once masked with UILST_FLT_SORT_MASK. */
|
||||
/** Just for sake of consistency. */
|
||||
|
|
@ -596,7 +611,7 @@ enum {
|
|||
|
||||
#define RGN_SPLIT_PREV 32
|
||||
|
||||
/* region flag */
|
||||
/** #ARegion.flag */
|
||||
enum {
|
||||
RGN_FLAG_HIDDEN = (1 << 0),
|
||||
RGN_FLAG_TOO_SMALL = (1 << 1),
|
||||
|
|
@ -610,7 +625,7 @@ enum {
|
|||
RGN_FLAG_PREFSIZE_OR_HIDDEN = (1 << 4),
|
||||
};
|
||||
|
||||
/* region do_draw */
|
||||
/** #ARegion.do_draw */
|
||||
#define RGN_DRAW 1
|
||||
#define RGN_DRAW_PARTIAL 2
|
||||
#define RGN_DRAWING 4
|
||||
|
|
|
|||
|
|
@ -501,28 +501,6 @@ typedef enum eSpaceNla_Flag {
|
|||
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Timeline
|
||||
* \{ */
|
||||
|
||||
/* SpaceTime.redraws (now bScreen.redraws_flag) */
|
||||
typedef enum eScreen_Redraws_Flag {
|
||||
TIME_REGION = (1 << 0),
|
||||
TIME_ALL_3D_WIN = (1 << 1),
|
||||
TIME_ALL_ANIM_WIN = (1 << 2),
|
||||
TIME_ALL_BUTS_WIN = (1 << 3),
|
||||
// TIME_WITH_SEQ_AUDIO = (1 << 4), /* DEPRECATED */
|
||||
TIME_SEQ = (1 << 5),
|
||||
TIME_ALL_IMAGE_WIN = (1 << 6),
|
||||
// TIME_CONTINUE_PHYSICS = (1 << 7), /* UNUSED */
|
||||
TIME_NODES = (1 << 8),
|
||||
TIME_CLIPS = (1 << 9),
|
||||
|
||||
TIME_FOLLOW = (1 << 15),
|
||||
} eScreen_Redraws_Flag;
|
||||
|
||||
/** \} */
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/** \name Sequence Editor
|
||||
* \{ */
|
||||
|
|
|
|||
Loading…
Reference in New Issue