From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat --- source/blender/editors/include/ED_screen_types.h | 116 +++++++++++------------ 1 file changed, 58 insertions(+), 58 deletions(-) (limited to 'source/blender/editors/include/ED_screen_types.h') diff --git a/source/blender/editors/include/ED_screen_types.h b/source/blender/editors/include/ED_screen_types.h index 46b8a9b34de..3cbeab247ef 100644 --- a/source/blender/editors/include/ED_screen_types.h +++ b/source/blender/editors/include/ED_screen_types.h @@ -28,28 +28,28 @@ /* for animplayer */ typedef struct ScreenAnimData { - ARegion *ar; /* do not read from this, only for comparing if region exists */ - short redraws; - short refresh; - short flag; /* flags for playback */ - int sfra; /* frame that playback was started from */ - int nextfra; /* next frame to go to (when ANIMPLAY_FLAG_USE_NEXT_FRAME is set) */ - double last_duration; /* used for frame dropping */ - bool from_anim_edit; /* playback was invoked from animation editor */ + ARegion *ar; /* do not read from this, only for comparing if region exists */ + short redraws; + short refresh; + short flag; /* flags for playback */ + int sfra; /* frame that playback was started from */ + int nextfra; /* next frame to go to (when ANIMPLAY_FLAG_USE_NEXT_FRAME is set) */ + double last_duration; /* used for frame dropping */ + bool from_anim_edit; /* playback was invoked from animation editor */ } ScreenAnimData; /* for animplayer */ enum { - /* user-setting - frame range is played backwards */ - ANIMPLAY_FLAG_REVERSE = (1 << 0), - /* temporary - playback just jumped to the start/end */ - ANIMPLAY_FLAG_JUMPED = (1 << 1), - /* drop frames as needed to maintain framerate */ - ANIMPLAY_FLAG_SYNC = (1 << 2), - /* don't drop frames (and ignore SCE_FRAME_DROP flag) */ - ANIMPLAY_FLAG_NO_SYNC = (1 << 3), - /* use nextfra at next timer update */ - ANIMPLAY_FLAG_USE_NEXT_FRAME = (1 << 4), + /* user-setting - frame range is played backwards */ + ANIMPLAY_FLAG_REVERSE = (1 << 0), + /* temporary - playback just jumped to the start/end */ + ANIMPLAY_FLAG_JUMPED = (1 << 1), + /* drop frames as needed to maintain framerate */ + ANIMPLAY_FLAG_SYNC = (1 << 2), + /* don't drop frames (and ignore SCE_FRAME_DROP flag) */ + ANIMPLAY_FLAG_NO_SYNC = (1 << 3), + /* use nextfra at next timer update */ + ANIMPLAY_FLAG_USE_NEXT_FRAME = (1 << 4), }; /* ----------------------------------------------------- */ @@ -60,64 +60,64 @@ enum { * stored during runtime as scene->fps_info */ typedef struct ScreenFrameRateInfo { - double redrawtime; - double lredrawtime; - float redrawtimes_fps[REDRAW_FRAME_AVERAGE]; - short redrawtime_index; + double redrawtime; + double lredrawtime; + float redrawtimes_fps[REDRAW_FRAME_AVERAGE]; + short redrawtime_index; } ScreenFrameRateInfo; /* ----------------------------------------------------- */ /* Enum for Action Zone Edges. Which edge of area is action zone. */ typedef enum { - /** Region located on the left, _right_ edge is action zone. - * Region minimized to the top left */ - AE_RIGHT_TO_TOPLEFT, - /** Region located on the right, _left_ edge is action zone. - * Region minimized to the top right */ - AE_LEFT_TO_TOPRIGHT, - /** Region located at the bottom, _top_ edge is action zone. - * Region minimized to the bottom right */ - AE_TOP_TO_BOTTOMRIGHT, - /** Region located at the top, _bottom_ edge is action zone. - * Region minimized to the top left */ - AE_BOTTOM_TO_TOPLEFT, + /** Region located on the left, _right_ edge is action zone. + * Region minimized to the top left */ + AE_RIGHT_TO_TOPLEFT, + /** Region located on the right, _left_ edge is action zone. + * Region minimized to the top right */ + AE_LEFT_TO_TOPRIGHT, + /** Region located at the bottom, _top_ edge is action zone. + * Region minimized to the bottom right */ + AE_TOP_TO_BOTTOMRIGHT, + /** Region located at the top, _bottom_ edge is action zone. + * Region minimized to the top left */ + AE_BOTTOM_TO_TOPLEFT, } AZEdge; typedef enum { - AZ_SCROLL_VERT, - AZ_SCROLL_HOR, + AZ_SCROLL_VERT, + AZ_SCROLL_HOR, } AZScrollDirection; /* for editing areas/regions */ typedef struct AZone { - struct AZone *next, *prev; - ARegion *ar; - int type; + struct AZone *next, *prev; + ARegion *ar; + int type; - union { - /* region-azone, which of the edges (only for AZONE_REGION) */ - AZEdge edge; - AZScrollDirection direction; - }; - /* for draw */ - short x1, y1, x2, y2; - /* for clip */ - rcti rect; - /* for fade in/out */ - float alpha; + union { + /* region-azone, which of the edges (only for AZONE_REGION) */ + AZEdge edge; + AZScrollDirection direction; + }; + /* for draw */ + short x1, y1, x2, y2; + /* for clip */ + rcti rect; + /* for fade in/out */ + float alpha; } AZone; /* actionzone type */ enum { - /* corner widgets for splitting areas */ - AZONE_AREA = 1, - /* when a region is collapsed, draw a handle to expose */ - AZONE_REGION, - /* when in editor fullscreen draw a corner to go to normal mode */ - AZONE_FULLSCREEN, - /* Hotspot azone around scrollbars to show/hide them. */ - AZONE_REGION_SCROLL, + /* corner widgets for splitting areas */ + AZONE_AREA = 1, + /* when a region is collapsed, draw a handle to expose */ + AZONE_REGION, + /* when in editor fullscreen draw a corner to go to normal mode */ + AZONE_FULLSCREEN, + /* Hotspot azone around scrollbars to show/hide them. */ + AZONE_REGION_SCROLL, }; #endif /* __ED_SCREEN_TYPES_H__ */ -- cgit v1.2.3