Cleanup: use bool and enums in `match_region_with_redraws`

Function used int for everything.
This commit is contained in:
Jeroen Bakker 2020-06-19 08:11:25 +02:00
parent 642b19c8b8
commit d093f61667
2 changed files with 27 additions and 21 deletions

View File

@ -4274,57 +4274,59 @@ static void SCREEN_OT_region_context_menu(wmOperatorType *ot)
* Animation Step.
* \{ */
static int match_region_with_redraws(int spacetype,
int regiontype,
int redraws,
bool from_anim_edit)
static bool match_region_with_redraws(eSpace_Type spacetype,
eRegionType regiontype,
eScreen_Redraws_Flag redraws,
bool from_anim_edit)
{
if (regiontype == RGN_TYPE_WINDOW) {
switch (spacetype) {
case SPACE_VIEW3D:
if ((redraws & TIME_ALL_3D_WIN) || from_anim_edit) {
return 1;
return true;
}
break;
case SPACE_GRAPH:
case SPACE_NLA:
if ((redraws & TIME_ALL_ANIM_WIN) || from_anim_edit) {
return 1;
return true;
}
break;
case SPACE_ACTION:
/* if only 1 window or 3d windows, we do timeline too
* NOTE: Now we do action editor in all these cases, since timeline is here. */
if ((redraws & (TIME_ALL_ANIM_WIN | TIME_REGION | TIME_ALL_3D_WIN)) || from_anim_edit) {
return 1;
return true;
}
break;
case SPACE_PROPERTIES:
if (redraws & TIME_ALL_BUTS_WIN) {
return 1;
return true;
}
break;
case SPACE_SEQ:
if ((redraws & (TIME_SEQ | TIME_ALL_ANIM_WIN)) || from_anim_edit) {
return 1;
return true;
}
break;
case SPACE_NODE:
if (redraws & TIME_NODES) {
return 1;
return true;
}
break;
case SPACE_IMAGE:
if ((redraws & TIME_ALL_IMAGE_WIN) || from_anim_edit) {
return 1;
return true;
}
break;
case SPACE_CLIP:
if ((redraws & TIME_CLIPS) || from_anim_edit) {
return 1;
return true;
}
break;
default:
break;
}
}
else if (regiontype == RGN_TYPE_CHANNELS) {
@ -4333,9 +4335,11 @@ static int match_region_with_redraws(int spacetype,
case SPACE_ACTION:
case SPACE_NLA:
if (redraws & TIME_ALL_ANIM_WIN) {
return 1;
return true;
}
break;
default:
break;
}
}
else if (regiontype == RGN_TYPE_UI) {
@ -4345,30 +4349,32 @@ static int match_region_with_redraws(int spacetype,
* during playback, so asking people to enable special option
* for this is a bit tricky, so add exception here for refreshing
* Properties Editor for SpaceClip always */
return 1;
return true;
}
if (redraws & TIME_ALL_BUTS_WIN) {
return 1;
return true;
}
}
else if (ELEM(regiontype, RGN_TYPE_HEADER, RGN_TYPE_TOOL_HEADER)) {
if (spacetype == SPACE_ACTION) {
return 1;
return true;
}
}
else if (regiontype == RGN_TYPE_PREVIEW) {
switch (spacetype) {
case SPACE_SEQ:
if (redraws & (TIME_SEQ | TIME_ALL_ANIM_WIN)) {
return 1;
return true;
}
break;
case SPACE_CLIP:
return 1;
return true;
default:
break;
}
}
return 0;
return false;
}
//#define PROFILE_AUDIO_SYNCH

View File

@ -609,7 +609,7 @@ enum {
/* regiontype, first two are the default set */
/* Do NOT change order, append on end. Types are hardcoded needed */
enum {
typedef enum eRegionType {
RGN_TYPE_WINDOW = 0,
RGN_TYPE_HEADER = 1,
RGN_TYPE_CHANNELS = 2,
@ -625,7 +625,7 @@ enum {
RGN_TYPE_EXECUTE = 10,
RGN_TYPE_FOOTER = 11,
RGN_TYPE_TOOL_HEADER = 12,
};
} eRegionType;
/* use for function args */
#define RGN_TYPE_ANY -1