diff options
author | Julian Eisel <julian@blender.org> | 2020-03-06 18:56:42 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-03-06 19:19:23 +0300 |
commit | b2ee1770d4c31078518f4ec9edd5196a41345162 (patch) | |
tree | 6b7f6ff9057322245fc3b3407bece3f1c0cb3eb5 /source/blender/editors/interface/interface_intern.h | |
parent | b825a95ec311a169d33fe21e28418f11a516c82f (diff) |
Cleanup: Rename ARegion variables from ar to region
The old convention was easy to confuse with ScrArea.
Part of https://developer.blender.org/T74432.
This is mostly a batch rename with some manual fixing. Only single word
variable names are changed, no prefixed/suffixed names.
Brecht van Lommel and Campbell Barton both gave me a green light for
this convention change.
Also ran clan clang format on affected files.
Diffstat (limited to 'source/blender/editors/interface/interface_intern.h')
-rw-r--r-- | source/blender/editors/interface/interface_intern.h | 102 |
1 files changed, 56 insertions, 46 deletions
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 3fe2750e070..248979e1ae7 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -456,23 +456,29 @@ typedef struct uiSafetyRct { void ui_fontscale(short *points, float aspect); -extern void ui_block_to_window_fl(const struct ARegion *ar, uiBlock *block, float *x, float *y); -extern void ui_block_to_window(const struct ARegion *ar, uiBlock *block, int *x, int *y); -extern void ui_block_to_window_rctf(const struct ARegion *ar, +extern void ui_block_to_window_fl(const struct ARegion *region, + uiBlock *block, + float *x, + float *y); +extern void ui_block_to_window(const struct ARegion *region, uiBlock *block, int *x, int *y); +extern void ui_block_to_window_rctf(const struct ARegion *region, uiBlock *block, rctf *rct_dst, const rctf *rct_src); -extern float ui_block_to_window_scale(const struct ARegion *ar, uiBlock *block); -extern void ui_window_to_block_fl(const struct ARegion *ar, uiBlock *block, float *x, float *y); -extern void ui_window_to_block(const struct ARegion *ar, uiBlock *block, int *x, int *y); -extern void ui_window_to_block_rctf(const struct ARegion *ar, +extern float ui_block_to_window_scale(const struct ARegion *region, uiBlock *block); +extern void ui_window_to_block_fl(const struct ARegion *region, + uiBlock *block, + float *x, + float *y); +extern void ui_window_to_block(const struct ARegion *region, uiBlock *block, int *x, int *y); +extern void ui_window_to_block_rctf(const struct ARegion *region, uiBlock *block, rctf *rct_dst, const rctf *rct_src); -extern void ui_window_to_region(const ARegion *ar, int *x, int *y); -extern void ui_window_to_region_rcti(const ARegion *ar, rcti *rect_dst, const rcti *rct_src); -extern void ui_region_to_window(const struct ARegion *ar, int *x, int *y); -extern void ui_region_winrct_get_no_margin(const struct ARegion *ar, struct rcti *r_rect); +extern void ui_window_to_region(const ARegion *region, int *x, int *y); +extern void ui_window_to_region_rcti(const ARegion *region, rcti *rect_dst, const rcti *rct_src); +extern void ui_region_to_window(const struct ARegion *region, int *x, int *y); +extern void ui_region_winrct_get_no_margin(const struct ARegion *region, struct rcti *r_rect); extern double ui_but_value_get(uiBut *but); extern void ui_but_value_set(uiBut *but, double value); @@ -642,16 +648,16 @@ ColorPicker *ui_block_colorpicker_create(struct uiBlock *block); /* Searchbox for string button */ ARegion *ui_searchbox_create_generic(struct bContext *C, struct ARegion *butregion, uiBut *but); ARegion *ui_searchbox_create_operator(struct bContext *C, struct ARegion *butregion, uiBut *but); -bool ui_searchbox_inside(struct ARegion *ar, int x, int y); -int ui_searchbox_find_index(struct ARegion *ar, const char *name); -void ui_searchbox_update(struct bContext *C, struct ARegion *ar, uiBut *but, const bool reset); -int ui_searchbox_autocomplete(struct bContext *C, struct ARegion *ar, uiBut *but, char *str); +bool ui_searchbox_inside(struct ARegion *region, int x, int y); +int ui_searchbox_find_index(struct ARegion *region, const char *name); +void ui_searchbox_update(struct bContext *C, struct ARegion *region, uiBut *but, const bool reset); +int ui_searchbox_autocomplete(struct bContext *C, struct ARegion *region, uiBut *but, char *str); void ui_searchbox_event(struct bContext *C, - struct ARegion *ar, + struct ARegion *region, uiBut *but, const struct wmEvent *event); -bool ui_searchbox_apply(uiBut *but, struct ARegion *ar); -void ui_searchbox_free(struct bContext *C, struct ARegion *ar); +bool ui_searchbox_apply(uiBut *but, struct ARegion *region); +void ui_searchbox_free(struct bContext *C, struct ARegion *region); void ui_but_search_refresh(uiBut *but); /* interface_region_menu_popup.c */ @@ -696,7 +702,7 @@ void ui_pie_menu_level_create(uiBlock *block, int flag); /* interface_region_popup.c */ -void ui_popup_translate(struct ARegion *ar, const int mdiff[2]); +void ui_popup_translate(struct ARegion *region, const int mdiff[2]); void ui_popup_block_free(struct bContext *C, uiPopupBlockHandle *handle); void ui_popup_block_scrolltest(struct uiBlock *block); @@ -705,7 +711,7 @@ void ui_popup_block_scrolltest(struct uiBlock *block); /* interface_panel.c */ extern int ui_handler_panel_region(struct bContext *C, const struct wmEvent *event, - struct ARegion *ar, + struct ARegion *region, const uiBut *active_but); extern void ui_draw_aligned_panel(struct uiStyle *style, uiBlock *block, @@ -723,33 +729,33 @@ void ui_draw_but_TAB_outline(const rcti *rect, float rad, uchar highlight[3], uchar highlight_fade[3]); -void ui_draw_but_HISTOGRAM(ARegion *ar, +void ui_draw_but_HISTOGRAM(ARegion *region, uiBut *but, const struct uiWidgetColors *wcol, const rcti *rect); -void ui_draw_but_WAVEFORM(ARegion *ar, +void ui_draw_but_WAVEFORM(ARegion *region, uiBut *but, const struct uiWidgetColors *wcol, const rcti *rect); -void ui_draw_but_VECTORSCOPE(ARegion *ar, +void ui_draw_but_VECTORSCOPE(ARegion *region, uiBut *but, const struct uiWidgetColors *wcol, const rcti *rect); void ui_draw_but_COLORBAND(uiBut *but, const struct uiWidgetColors *wcol, const rcti *rect); void ui_draw_but_UNITVEC(uiBut *but, const struct uiWidgetColors *wcol, const rcti *rect); -void ui_draw_but_CURVE(ARegion *ar, +void ui_draw_but_CURVE(ARegion *region, uiBut *but, const struct uiWidgetColors *wcol, const rcti *rect); -void ui_draw_but_CURVEPROFILE(ARegion *ar, +void ui_draw_but_CURVEPROFILE(ARegion *region, uiBut *but, const struct uiWidgetColors *wcol, const rcti *rect); -void ui_draw_but_IMAGE(ARegion *ar, +void ui_draw_but_IMAGE(ARegion *region, uiBut *but, const struct uiWidgetColors *wcol, const rcti *rect); -void ui_draw_but_TRACKPREVIEW(ARegion *ar, +void ui_draw_but_TRACKPREVIEW(ARegion *region, uiBut *but, const struct uiWidgetColors *wcol, const rcti *rect); @@ -759,14 +765,14 @@ PointerRNA *ui_handle_afterfunc_add_operator(struct wmOperatorType *ot, int opcontext, bool create_props); extern void ui_pan_to_scroll(const struct wmEvent *event, int *type, int *val); -extern void ui_but_activate_event(struct bContext *C, struct ARegion *ar, uiBut *but); -extern void ui_but_activate_over(struct bContext *C, struct ARegion *ar, uiBut *but); +extern void ui_but_activate_event(struct bContext *C, struct ARegion *region, uiBut *but); +extern void ui_but_activate_over(struct bContext *C, struct ARegion *region, uiBut *but); extern void ui_but_execute_begin(struct bContext *C, - struct ARegion *ar, + struct ARegion *region, uiBut *but, void **active_back); extern void ui_but_execute_end(struct bContext *C, - struct ARegion *ar, + struct ARegion *region, uiBut *but, void *active_back); extern void ui_but_active_free(const struct bContext *C, uiBut *but); @@ -826,7 +832,7 @@ struct GPUBatch *ui_batch_roundbox_shadow_get(void); void ui_draw_anti_tria_rect(const rctf *rect, char dir, const float color[4]); void ui_draw_menu_back(struct uiStyle *style, uiBlock *block, rcti *rect); -void ui_draw_popover_back(ARegion *ar, struct uiStyle *style, uiBlock *block, rcti *rect); +void ui_draw_popover_back(ARegion *region, struct uiStyle *style, uiBlock *block, rcti *rect); void ui_draw_pie_center(uiBlock *block); const struct uiWidgetColors *ui_tooltip_get_theme(void); @@ -835,7 +841,7 @@ void ui_draw_widget_menu_back(const rcti *rect, bool use_shadow); void ui_draw_tooltip_background(struct uiStyle *UNUSED(style), uiBlock *block, rcti *rect); extern void ui_draw_but( - const struct bContext *C, ARegion *ar, struct uiStyle *style, uiBut *but, rcti *rect); + const struct bContext *C, ARegion *region, struct uiStyle *style, uiBut *but, rcti *rect); void ui_draw_menu_item(const struct uiFontStyle *fstyle, rcti *rect, @@ -884,7 +890,7 @@ void ui_item_paneltype_func(struct bContext *C, struct uiLayout *layout, void *a /* interface_align.c */ bool ui_but_can_align(const uiBut *but) ATTR_WARN_UNUSED_RESULT; -int ui_but_align_opposite_to_area_align_get(const ARegion *ar) ATTR_WARN_UNUSED_RESULT; +int ui_but_align_opposite_to_area_align_get(const ARegion *region) ATTR_WARN_UNUSED_RESULT; void ui_block_align_calc(uiBlock *block, const ARegion *region); /* interface_anim.c */ @@ -913,24 +919,24 @@ bool ui_but_is_cursor_warp(const uiBut *but) ATTR_WARN_UNUSED_RESULT; bool ui_but_contains_pt(const uiBut *but, float mx, float my) ATTR_WARN_UNUSED_RESULT; bool ui_but_contains_rect(const uiBut *but, const rctf *rect); bool ui_but_contains_point_px_icon(const uiBut *but, - struct ARegion *ar, + struct ARegion *region, const struct wmEvent *event) ATTR_WARN_UNUSED_RESULT; -bool ui_but_contains_point_px(const uiBut *but, const struct ARegion *ar, int x, int y) +bool ui_but_contains_point_px(const uiBut *but, const struct ARegion *region, int x, int y) ATTR_WARN_UNUSED_RESULT; -uiBut *ui_list_find_mouse_over(struct ARegion *ar, +uiBut *ui_list_find_mouse_over(struct ARegion *region, const struct wmEvent *event) ATTR_WARN_UNUSED_RESULT; -uiBut *ui_but_find_mouse_over_ex(struct ARegion *ar, +uiBut *ui_but_find_mouse_over_ex(struct ARegion *region, const int x, const int y, const bool labeledit) ATTR_WARN_UNUSED_RESULT; -uiBut *ui_but_find_mouse_over(struct ARegion *ar, +uiBut *ui_but_find_mouse_over(struct ARegion *region, const struct wmEvent *event) ATTR_WARN_UNUSED_RESULT; -uiBut *ui_but_find_rect_over(const struct ARegion *ar, +uiBut *ui_but_find_rect_over(const struct ARegion *region, const rcti *rect_px) ATTR_WARN_UNUSED_RESULT; -uiBut *ui_list_find_mouse_over_ex(struct ARegion *ar, int x, int y) ATTR_WARN_UNUSED_RESULT; +uiBut *ui_list_find_mouse_over_ex(struct ARegion *region, int x, int y) ATTR_WARN_UNUSED_RESULT; bool ui_but_contains_password(const uiBut *but) ATTR_WARN_UNUSED_RESULT; @@ -944,17 +950,21 @@ bool ui_block_is_popover(const uiBlock *block) ATTR_WARN_UNUSED_RESULT; bool ui_block_is_pie_menu(const uiBlock *block) ATTR_WARN_UNUSED_RESULT; bool ui_block_is_popup_any(const uiBlock *block) ATTR_WARN_UNUSED_RESULT; -uiBut *ui_region_find_first_but_test_flag(struct ARegion *ar, int flag_include, int flag_exclude); -uiBut *ui_region_find_active_but(struct ARegion *ar) ATTR_WARN_UNUSED_RESULT; -bool ui_region_contains_point_px(const struct ARegion *ar, int x, int y) ATTR_WARN_UNUSED_RESULT; -bool ui_region_contains_rect_px(const struct ARegion *ar, const rcti *rect_px); +uiBut *ui_region_find_first_but_test_flag(struct ARegion *region, + int flag_include, + int flag_exclude); +uiBut *ui_region_find_active_but(struct ARegion *region) ATTR_WARN_UNUSED_RESULT; +bool ui_region_contains_point_px(const struct ARegion *region, + int x, + int y) ATTR_WARN_UNUSED_RESULT; +bool ui_region_contains_rect_px(const struct ARegion *region, const rcti *rect_px); ARegion *ui_screen_region_find_mouse_over_ex(bScreen *screen, int x, int y); ARegion *ui_screen_region_find_mouse_over(bScreen *screen, const struct wmEvent *event); /* interface_context_menu.c */ bool ui_popup_context_menu_for_button(struct bContext *C, uiBut *but); -void ui_popup_context_menu_for_panel(struct bContext *C, struct ARegion *ar, struct Panel *pa); +void ui_popup_context_menu_for_panel(struct bContext *C, struct ARegion *region, struct Panel *pa); /* interface_eyedropper.c */ struct wmKeyMap *eyedropper_modal_keymap(struct wmKeyConfig *keyconf); |