diff options
Diffstat (limited to 'source/blender/editors/include/UI_interface.h')
| -rw-r--r-- | source/blender/editors/include/UI_interface.h | 58 |
1 files changed, 31 insertions, 27 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index e83582b19d0..277f330ad50 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -604,7 +604,7 @@ struct uiLayout *UI_pie_menu_layout(struct uiPieMenu *pie); * * Functions used to create popup blocks. These are like popup menus * but allow using all button types and creating an own layout. */ -typedef uiBlock *(*uiBlockCreateFunc)(struct bContext *C, struct ARegion *ar, void *arg1); +typedef uiBlock *(*uiBlockCreateFunc)(struct bContext *C, struct ARegion *region, void *arg1); typedef void (*uiBlockCancelFunc)(struct bContext *C, void *arg1); void UI_popup_block_invoke(struct bContext *C, @@ -728,16 +728,19 @@ void UI_but_type_set_menu_from_pulldown(uiBut *but); /* special button case, only draw it when used actively, for outliner etc */ bool UI_but_active_only_ex(const struct bContext *C, - struct ARegion *ar, + struct ARegion *region, uiBlock *block, uiBut *but, const bool remove_on_failure); -bool UI_but_active_only(const struct bContext *C, struct ARegion *ar, uiBlock *block, uiBut *but); +bool UI_but_active_only(const struct bContext *C, + struct ARegion *region, + uiBlock *block, + uiBut *but); bool UI_block_active_only_flagged_buttons(const struct bContext *C, - struct ARegion *ar, + struct ARegion *region, struct uiBlock *block); -void UI_but_execute(const struct bContext *C, struct ARegion *ar, uiBut *but); +void UI_but_execute(const struct bContext *C, struct ARegion *region, uiBut *but); bool UI_but_online_manual_id(const uiBut *but, char *r_str, @@ -1599,7 +1602,7 @@ void UI_but_tooltip_refresh(struct bContext *C, uiBut *but); void UI_but_tooltip_timer_remove(struct bContext *C, uiBut *but); bool UI_textbutton_activate_rna(const struct bContext *C, - struct ARegion *ar, + struct ARegion *region, const void *rna_poin_data, const char *rna_prop_id); bool UI_textbutton_activate_but(const struct bContext *C, uiBut *but); @@ -1637,42 +1640,43 @@ int UI_autocomplete_end(AutoComplete *autocpl, char *autoname); * could use a good cleanup, though how they will function in 2.5 is * not clear yet so we postpone that. */ -void UI_panels_begin(const struct bContext *C, struct ARegion *ar); -void UI_panels_end(const struct bContext *C, struct ARegion *ar, int *r_x, int *r_y); -void UI_panels_draw(const struct bContext *C, struct ARegion *ar); +void UI_panels_begin(const struct bContext *C, struct ARegion *region); +void UI_panels_end(const struct bContext *C, struct ARegion *region, int *r_x, int *r_y); +void UI_panels_draw(const struct bContext *C, struct ARegion *region); struct Panel *UI_panel_find_by_type(struct ListBase *lb, struct PanelType *pt); struct Panel *UI_panel_begin(struct ScrArea *sa, - struct ARegion *ar, + struct ARegion *region, struct ListBase *lb, uiBlock *block, struct PanelType *pt, struct Panel *pa, bool *r_open); void UI_panel_end(const struct ScrArea *sa, - const struct ARegion *ar, + const struct ARegion *region, uiBlock *block, int width, int height, bool open); -void UI_panels_scale(struct ARegion *ar, float new_width); +void UI_panels_scale(struct ARegion *region, float new_width); void UI_panel_label_offset(struct uiBlock *block, int *r_x, int *r_y); int UI_panel_size_y(const struct Panel *pa); -bool UI_panel_category_is_visible(const struct ARegion *ar); -void UI_panel_category_add(struct ARegion *ar, const char *name); -struct PanelCategoryDyn *UI_panel_category_find(struct ARegion *ar, const char *idname); -struct PanelCategoryStack *UI_panel_category_active_find(struct ARegion *ar, const char *idname); -const char *UI_panel_category_active_get(struct ARegion *ar, bool set_fallback); -void UI_panel_category_active_set(struct ARegion *ar, const char *idname); -void UI_panel_category_active_set_default(struct ARegion *ar, const char *idname); -struct PanelCategoryDyn *UI_panel_category_find_mouse_over_ex(struct ARegion *ar, +bool UI_panel_category_is_visible(const struct ARegion *region); +void UI_panel_category_add(struct ARegion *region, const char *name); +struct PanelCategoryDyn *UI_panel_category_find(struct ARegion *region, const char *idname); +struct PanelCategoryStack *UI_panel_category_active_find(struct ARegion *region, + const char *idname); +const char *UI_panel_category_active_get(struct ARegion *region, bool set_fallback); +void UI_panel_category_active_set(struct ARegion *region, const char *idname); +void UI_panel_category_active_set_default(struct ARegion *region, const char *idname); +struct PanelCategoryDyn *UI_panel_category_find_mouse_over_ex(struct ARegion *region, const int x, const int y); -struct PanelCategoryDyn *UI_panel_category_find_mouse_over(struct ARegion *ar, +struct PanelCategoryDyn *UI_panel_category_find_mouse_over(struct ARegion *region, const struct wmEvent *event); -void UI_panel_category_clear_all(struct ARegion *ar); -void UI_panel_category_draw_all(struct ARegion *ar, const char *category_id_active); +void UI_panel_category_clear_all(struct ARegion *region); +void UI_panel_category_draw_all(struct ARegion *region, const char *category_id_active); struct PanelType *UI_paneltype_find(int space_id, int region_id, const char *idname); @@ -1805,7 +1809,7 @@ uiLayout *UI_block_layout(uiBlock *block, void UI_block_layout_set_current(uiBlock *block, uiLayout *layout); void UI_block_layout_resolve(uiBlock *block, int *r_x, int *r_y); -void UI_region_message_subscribe(struct ARegion *ar, struct wmMsgBus *mbus); +void UI_region_message_subscribe(struct ARegion *region, struct wmMsgBus *mbus); uiBlock *uiLayoutGetBlock(uiLayout *layout); @@ -2376,8 +2380,8 @@ void UI_context_active_but_prop_get_templateID(struct bContext *C, struct PropertyRNA **r_prop); struct ID *UI_context_active_but_get_tab_ID(struct bContext *C); -uiBut *UI_region_active_but_get(struct ARegion *ar); -uiBut *UI_region_but_find_rect_over(const struct ARegion *ar, const struct rcti *isect); +uiBut *UI_region_active_but_get(struct ARegion *region); +uiBut *UI_region_but_find_rect_over(const struct ARegion *region, const struct rcti *isect); /* uiFontStyle.align */ typedef enum eFontStyle_Align { @@ -2454,7 +2458,7 @@ struct ARegion *UI_tooltip_create_from_button(struct bContext *C, uiBut *but, bool is_label); struct ARegion *UI_tooltip_create_from_gizmo(struct bContext *C, struct wmGizmo *gz); -void UI_tooltip_free(struct bContext *C, struct bScreen *sc, struct ARegion *ar); +void UI_tooltip_free(struct bContext *C, struct bScreen *sc, struct ARegion *region); /* How long before a tool-tip shows. */ #define UI_TOOLTIP_DELAY 0.5 |