diff options
Diffstat (limited to 'source/blender/editors/include/UI_view2d.h')
| -rw-r--r-- | source/blender/editors/include/UI_view2d.h | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/source/blender/editors/include/UI_view2d.h b/source/blender/editors/include/UI_view2d.h index e34f40d057d..ff9719d4674 100644 --- a/source/blender/editors/include/UI_view2d.h +++ b/source/blender/editors/include/UI_view2d.h @@ -28,6 +28,10 @@ #include "BLI_compiler_attrs.h" +#ifdef __cplusplus +extern "C" { +#endif + /* ------------------------------------------ */ /* Settings and Defines: */ @@ -129,7 +133,7 @@ void UI_view2d_zoom_cache_reset(void); /* view matrix operations */ void UI_view2d_view_ortho(const struct View2D *v2d); -void UI_view2d_view_orthoSpecial(struct ARegion *ar, struct View2D *v2d, const bool xaxis); +void UI_view2d_view_orthoSpecial(struct ARegion *region, struct View2D *v2d, const bool xaxis); void UI_view2d_view_restore(const struct bContext *C); /* grid drawing */ @@ -154,21 +158,21 @@ float UI_view2d_grid_resolution_x__frames_or_seconds(const struct View2D *v2d, float UI_view2d_grid_resolution_y__values(const struct View2D *v2d); /* scale indicator text drawing */ -void UI_view2d_draw_scale_y__values(const struct ARegion *ar, +void UI_view2d_draw_scale_y__values(const struct ARegion *region, const struct View2D *v2d, const struct rcti *rect, int colorid); -void UI_view2d_draw_scale_y__block(const struct ARegion *ar, +void UI_view2d_draw_scale_y__block(const struct ARegion *region, const struct View2D *v2d, const struct rcti *rect, int colorid); -void UI_view2d_draw_scale_x__discrete_frames_or_seconds(const struct ARegion *ar, +void UI_view2d_draw_scale_x__discrete_frames_or_seconds(const struct ARegion *region, const struct View2D *v2d, const struct rcti *rect, const struct Scene *scene, bool display_seconds, int colorid); -void UI_view2d_draw_scale_x__frames_or_seconds(const struct ARegion *ar, +void UI_view2d_draw_scale_x__frames_or_seconds(const struct ARegion *region, const struct View2D *v2d, const struct rcti *rect, const struct Scene *scene, @@ -232,35 +236,39 @@ void UI_view2d_center_set(struct View2D *v2d, float x, float y); void UI_view2d_offset(struct View2D *v2d, float xfac, float yfac); char UI_view2d_mouse_in_scrollers_ex( - const struct ARegion *ar, const struct View2D *v2d, int x, int y, int *r_scroll); -char UI_view2d_mouse_in_scrollers(const struct ARegion *ar, + const struct ARegion *region, const struct View2D *v2d, int x, int y, int *r_scroll); +char UI_view2d_mouse_in_scrollers(const struct ARegion *region, const struct View2D *v2d, int x, int y); -char UI_view2d_rect_in_scrollers_ex(const struct ARegion *ar, +char UI_view2d_rect_in_scrollers_ex(const struct ARegion *region, const struct View2D *v2d, const struct rcti *rect, int *r_scroll); -char UI_view2d_rect_in_scrollers(const struct ARegion *ar, +char UI_view2d_rect_in_scrollers(const struct ARegion *region, const struct View2D *v2d, const struct rcti *rect); /* cached text drawing in v2d, to allow pixel-aligned draw as post process */ -void UI_view2d_text_cache_add( - struct View2D *v2d, float x, float y, const char *str, size_t str_len, const char col[4]); +void UI_view2d_text_cache_add(struct View2D *v2d, + float x, + float y, + const char *str, + size_t str_len, + const unsigned char col[4]); void UI_view2d_text_cache_add_rectf(struct View2D *v2d, const struct rctf *rect_view, const char *str, size_t str_len, - const char col[4]); -void UI_view2d_text_cache_draw(struct ARegion *ar); + const unsigned char col[4]); +void UI_view2d_text_cache_draw(struct ARegion *region); /* operators */ void ED_operatortypes_view2d(void); void ED_keymap_view2d(struct wmKeyConfig *keyconf); void UI_view2d_smooth_view(struct bContext *C, - struct ARegion *ar, + struct ARegion *region, const struct rctf *cur, const int smooth_viewtx); @@ -273,4 +281,8 @@ void UI_view2d_smooth_view(struct bContext *C, /* Caller passes in own idname. */ void VIEW2D_GGT_navigate_impl(struct wmGizmoGroupType *gzgt, const char *idname); +#ifdef __cplusplus +} +#endif + #endif /* __UI_VIEW2D_H__ */ |