From 5cd3e1b5d153bc2809d4fdfcdd030b054a301a4e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 22 Mar 2019 17:56:58 +1100 Subject: Cleanup: move widget enum into source file --- .../blender/editors/interface/interface_intern.h | 54 +--------------------- 1 file changed, 2 insertions(+), 52 deletions(-) (limited to 'source/blender/editors/interface/interface_intern.h') diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 1ca83b929e7..84608e89348 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -50,53 +50,6 @@ struct wmTimer; #define RNA_NO_INDEX -1 #define RNA_ENUM_VALUE -2 -/* visual types for drawing */ -/* for time being separated from functional types */ -typedef enum { - /* default */ - UI_WTYPE_REGULAR, - - /* standard set */ - UI_WTYPE_LABEL, - UI_WTYPE_TOGGLE, - UI_WTYPE_CHECKBOX, - UI_WTYPE_RADIO, - UI_WTYPE_NUMBER, - UI_WTYPE_SLIDER, - UI_WTYPE_EXEC, - UI_WTYPE_TOOLBAR_ITEM, - UI_WTYPE_TAB, - UI_WTYPE_TOOLTIP, - - /* strings */ - UI_WTYPE_NAME, - UI_WTYPE_NAME_LINK, - UI_WTYPE_POINTER_LINK, - UI_WTYPE_FILENAME, - - /* menus */ - UI_WTYPE_MENU_RADIO, - UI_WTYPE_MENU_ICON_RADIO, - UI_WTYPE_MENU_POINTER_LINK, - UI_WTYPE_MENU_NODE_LINK, - - UI_WTYPE_PULLDOWN, - UI_WTYPE_MENU_ITEM, - UI_WTYPE_MENU_ITEM_RADIAL, - UI_WTYPE_MENU_BACK, - - /* specials */ - UI_WTYPE_ICON, - UI_WTYPE_ICON_LABEL, - UI_WTYPE_SWATCH, - UI_WTYPE_RGB_PICKER, - UI_WTYPE_UNITVEC, - UI_WTYPE_BOX, - UI_WTYPE_SCROLL, - UI_WTYPE_LISTITEM, - UI_WTYPE_PROGRESSBAR, -} uiWidgetTypeEnum; - #define UI_MENU_PADDING (int)(0.2f * UI_UNIT_Y) #define UI_MENU_WIDTH_MIN (UI_UNIT_Y * 9) @@ -795,11 +748,8 @@ void ui_draw_popover_back(ARegion *ar, struct uiStyle *style, uiBlock *block, rc void ui_draw_pie_center(uiBlock *block); const struct uiWidgetColors *ui_tooltip_get_theme(void); -void ui_draw_widget_back_color( - uiWidgetTypeEnum type, bool use_shadow, const rcti *rect, - const float color[4]); -void ui_draw_widget_back( - uiWidgetTypeEnum type, bool use_shadow, const rcti *rect); +void ui_draw_widget_menu_back_color(const rcti *rect, bool use_shadow, const float color[4]); +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); -- cgit v1.2.3