diff options
author | Julian Eisel <julian@blender.org> | 2022-05-12 16:53:12 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2022-05-12 17:56:14 +0300 |
commit | 3693e1d8e80501c6efcb8f732107742f80acf773 (patch) | |
tree | 2fc6177061859beff71ffd3413fad4131724be82 /source/blender/editors/interface/interface_widgets.c | |
parent | c31f519954f2b21fecc86b1b3b9386685226dbdc (diff) |
Revert commits to increase button flag bitfield size
This reverts the commits 8d9d5da13706b668b9bd0d631e00c9b00b73f3ea,
59cd616534b46ab85b4324a0886bd9eb8876a48b and
98a04ed4524234b1840dc039c2f356db5ac57f26.
The commits are causing issues with MSVC, see D14926. I'm working on a
different solution, but that will need some work.
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
-rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 133 |
1 files changed, 52 insertions, 81 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 2801930ff1d..98ecf91adbc 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -256,10 +256,10 @@ typedef struct uiWidgetType { /* converted colors for state */ uiWidgetColors wcol; - void (*state)(struct uiWidgetType *, uint64_t state, int drawflag, eUIEmbossType emboss); - void (*draw)(uiWidgetColors *, rcti *, uint64_t state, int roundboxalign, const float zoom); + void (*state)(struct uiWidgetType *, int state, int drawflag, eUIEmbossType emboss); + void (*draw)(uiWidgetColors *, rcti *, int state, int roundboxalign, const float zoom); void (*custom)( - uiBut *, uiWidgetColors *, rcti *, uint64_t state, int roundboxalign, const float zoom); + uiBut *, uiWidgetColors *, rcti *, int state, int roundboxalign, const float zoom); void (*text)(const uiFontStyle *, const uiWidgetColors *, uiBut *, rcti *); } uiWidgetType; @@ -1289,7 +1289,7 @@ static void widgetbase_draw(uiWidgetBase *wtb, const uiWidgetColors *wcol) #define PREVIEW_PAD 4 -static float widget_alpha_factor(const uint64_t state) +static float widget_alpha_factor(const int state) { if (state & (UI_BUT_INACTIVE | UI_BUT_DISABLED)) { if (state & UI_SEARCH_FILTER_NO_MATCH) { @@ -2446,7 +2446,7 @@ static void widget_draw_text_icon(const uiFontStyle *fstyle, * \{ */ /* put all widget colors on half alpha, use local storage */ -static void ui_widget_color_disabled(uiWidgetType *wt, const uint64_t state) +static void ui_widget_color_disabled(uiWidgetType *wt, const int state) { static uiWidgetColors wcol_theme_s; @@ -2473,7 +2473,7 @@ static void widget_active_color(uiWidgetColors *wcol) } static const uchar *widget_color_blend_from_flags(const uiWidgetStateColors *wcol_state, - uint64_t state, + int state, int drawflag, const eUIEmbossType emboss) { @@ -2501,7 +2501,7 @@ static const uchar *widget_color_blend_from_flags(const uiWidgetStateColors *wco } /* copy colors from theme, and set changes in it based on state */ -static void widget_state(uiWidgetType *wt, uint64_t state, int drawflag, eUIEmbossType emboss) +static void widget_state(uiWidgetType *wt, int state, int drawflag, eUIEmbossType emboss) { uiWidgetStateColors *wcol_state = wt->wcol_state; @@ -2600,10 +2600,7 @@ static float widget_radius_from_rcti(const rcti *rect, const uiWidgetColors *wco * \{ */ /* sliders use special hack which sets 'item' as inner when drawing filling */ -static void widget_state_numslider(uiWidgetType *wt, - uint64_t state, - int drawflag, - eUIEmbossType emboss) +static void widget_state_numslider(uiWidgetType *wt, int state, int drawflag, eUIEmbossType emboss) { uiWidgetStateColors *wcol_state = wt->wcol_state; @@ -2627,7 +2624,7 @@ static void widget_state_numslider(uiWidgetType *wt, /* labels use theme colors for text */ static void widget_state_option_menu(uiWidgetType *wt, - uint64_t state, + int state, int drawflag, eUIEmbossType emboss) { @@ -2647,7 +2644,7 @@ static void widget_state_option_menu(uiWidgetType *wt, } static void widget_state_nothing(uiWidgetType *wt, - uint64_t UNUSED(state), + int UNUSED(state), int UNUSED(drawflag), eUIEmbossType UNUSED(emboss)) { @@ -2656,7 +2653,7 @@ static void widget_state_nothing(uiWidgetType *wt, /* special case, button that calls pulldown */ static void widget_state_pulldown(uiWidgetType *wt, - uint64_t UNUSED(state), + int UNUSED(state), int UNUSED(drawflag), eUIEmbossType UNUSED(emboss)) { @@ -2665,7 +2662,7 @@ static void widget_state_pulldown(uiWidgetType *wt, /* special case, pie menu items */ static void widget_state_pie_menu_item(uiWidgetType *wt, - uint64_t state, + int state, int UNUSED(drawflag), eUIEmbossType UNUSED(emboss)) { @@ -2700,7 +2697,7 @@ static void widget_state_pie_menu_item(uiWidgetType *wt, /* special case, menu items */ static void widget_state_menu_item(uiWidgetType *wt, - uint64_t state, + int state, int UNUSED(drawflag), eUIEmbossType UNUSED(emboss)) { @@ -2790,7 +2787,7 @@ static void widget_softshadow(const rcti *rect, int roundboxalign, const float r } static void widget_menu_back( - uiWidgetColors *wcol, rcti *rect, uint64_t flag, int direction, const float zoom) + uiWidgetColors *wcol, rcti *rect, int flag, int direction, const float zoom) { uiWidgetBase wtb; int roundboxalign = UI_CNR_ALL; @@ -3324,12 +3321,8 @@ static void ui_draw_separator(const rcti *rect, const uiWidgetColors *wcol) #define NUM_BUT_PADDING_FACTOR 0.425f -static void widget_numbut_draw(uiWidgetColors *wcol, - rcti *rect, - const float zoom, - uint64_t state, - int roundboxalign, - bool emboss) +static void widget_numbut_draw( + uiWidgetColors *wcol, rcti *rect, const float zoom, int state, int roundboxalign, bool emboss) { const float rad = widget_radius_from_zoom(zoom, wcol); const int handle_width = min_ii(BLI_rcti_size_x(rect) / 3, BLI_rcti_size_y(rect) * 0.7f); @@ -3430,13 +3423,13 @@ static void widget_numbut_draw(uiWidgetColors *wcol, } static void widget_numbut( - uiWidgetColors *wcol, rcti *rect, uint64_t state, int roundboxalign, const float zoom) + uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign, const float zoom) { widget_numbut_draw(wcol, rect, zoom, state, roundboxalign, false); } static void widget_menubut( - uiWidgetColors *wcol, rcti *rect, uint64_t UNUSED(state), int roundboxalign, const float zoom) + uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign, const float zoom) { uiWidgetBase wtb; widget_init(&wtb); @@ -3461,7 +3454,7 @@ static void widget_menubut( static void widget_menubut_embossn(const uiBut *UNUSED(but), uiWidgetColors *wcol, rcti *rect, - uint64_t UNUSED(state), + int UNUSED(state), int UNUSED(roundboxalign)) { uiWidgetBase wtb; @@ -3483,17 +3476,14 @@ static void widget_menubut_embossn(const uiBut *UNUSED(but), static void widget_numbut_embossn(const uiBut *UNUSED(but), uiWidgetColors *wcol, rcti *rect, - uint64_t state, + int state, int roundboxalign, const float zoom) { widget_numbut_draw(wcol, rect, zoom, state, roundboxalign, true); } -void UI_draw_widget_scroll(uiWidgetColors *wcol, - const rcti *rect, - const rcti *slider, - uint64_t state) +void UI_draw_widget_scroll(uiWidgetColors *wcol, const rcti *rect, const rcti *slider, int state) { uiWidgetBase wtb; bool outline = false; @@ -3583,7 +3573,7 @@ void UI_draw_widget_scroll(uiWidgetColors *wcol, static void widget_scroll(uiBut *but, uiWidgetColors *wcol, rcti *rect, - uint64_t state, + int state, int UNUSED(roundboxalign), const float UNUSED(zoom)) { @@ -3645,7 +3635,7 @@ static void widget_scroll(uiBut *but, static void widget_progressbar(uiBut *but, uiWidgetColors *wcol, rcti *rect, - uint64_t UNUSED(state), + int UNUSED(state), int roundboxalign, const float zoom) { @@ -3679,7 +3669,7 @@ static void widget_progressbar(uiBut *but, static void widget_treerow_exec(uiWidgetColors *wcol, rcti *rect, - uint64_t state, + int state, int UNUSED(roundboxalign), int indentation, const float zoom) @@ -3700,12 +3690,8 @@ static void widget_treerow_exec(uiWidgetColors *wcol, BLI_rcti_translate(rect, 0.5f * UI_UNIT_X * indentation, 0); } -static void widget_treerow(uiBut *but, - uiWidgetColors *wcol, - rcti *rect, - uint64_t state, - int roundboxalign, - const float zoom) +static void widget_treerow( + uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign, const float zoom) { uiButTreeRow *tree_row = (uiButTreeRow *)but; BLI_assert(but->type == UI_BTYPE_TREEROW); @@ -3715,7 +3701,7 @@ static void widget_treerow(uiBut *but, static void widget_nodesocket(uiBut *but, uiWidgetColors *wcol, rcti *rect, - uint64_t UNUSED(state), + int UNUSED(state), int UNUSED(roundboxalign), const float UNUSED(zoom)) { @@ -3751,12 +3737,8 @@ static void widget_nodesocket(uiBut *but, copy_v3_v3_uchar(wcol->outline, old_outline); } -static void widget_numslider(uiBut *but, - uiWidgetColors *wcol, - rcti *rect, - uint64_t state, - int roundboxalign, - const float zoom) +static void widget_numslider( + uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign, const float zoom) { uiWidgetBase wtb, wtb1; widget_init(&wtb); @@ -3868,12 +3850,8 @@ static void widget_numslider(uiBut *but, /* I think 3 is sufficient border to indicate keyed status */ #define SWATCH_KEYED_BORDER 3 -static void widget_swatch(uiBut *but, - uiWidgetColors *wcol, - rcti *rect, - uint64_t state, - int roundboxalign, - const float zoom) +static void widget_swatch( + uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign, const float zoom) { BLI_assert(but->type == UI_BTYPE_COLOR); uiButColor *color_but = (uiButColor *)but; @@ -3960,7 +3938,7 @@ static void widget_swatch(uiBut *but, static void widget_unitvec(uiBut *but, uiWidgetColors *wcol, rcti *rect, - uint64_t UNUSED(state), + int UNUSED(state), int UNUSED(roundboxalign), const float zoom) { @@ -3968,12 +3946,8 @@ static void widget_unitvec(uiBut *but, ui_draw_but_UNITVEC(but, wcol, rect, rad); } -static void widget_icon_has_anim(uiBut *but, - uiWidgetColors *wcol, - rcti *rect, - uint64_t state, - int roundboxalign, - const float zoom) +static void widget_icon_has_anim( + uiBut *but, uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign, const float zoom) { if (state & (UI_BUT_ANIMATED | UI_BUT_ANIMATED_KEY | UI_BUT_DRIVEN | UI_BUT_REDALERT) && but->emboss != UI_EMBOSS_NONE) { @@ -3997,7 +3971,7 @@ static void widget_icon_has_anim(uiBut *but, } static void widget_textbut( - uiWidgetColors *wcol, rcti *rect, uint64_t state, int roundboxalign, const float zoom) + uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign, const float zoom) { if (state & UI_SELECT) { SWAP(short, wcol->shadetop, wcol->shadedown); @@ -4015,7 +3989,7 @@ static void widget_textbut( static void widget_preview_tile(uiBut *but, uiWidgetColors *wcol, rcti *rect, - uint64_t UNUSED(state), + int UNUSED(state), int UNUSED(roundboxalign), const float UNUSED(zoom)) { @@ -4025,7 +3999,7 @@ static void widget_preview_tile(uiBut *but, } static void widget_menuiconbut( - uiWidgetColors *wcol, rcti *rect, uint64_t UNUSED(state), int roundboxalign, const float zoom) + uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign, const float zoom) { uiWidgetBase wtb; widget_init(&wtb); @@ -4038,7 +4012,7 @@ static void widget_menuiconbut( } static void widget_pulldownbut( - uiWidgetColors *wcol, rcti *rect, uint64_t state, int roundboxalign, const float zoom) + uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign, const float zoom) { float back[4]; UI_GetThemeColor4fv(TH_BACK, back); @@ -4068,7 +4042,7 @@ static void widget_pulldownbut( static void widget_menu_itembut(uiWidgetColors *wcol, rcti *rect, - uint64_t UNUSED(state), + int UNUSED(state), int UNUSED(roundboxalign), const float zoom) { @@ -4092,7 +4066,7 @@ static void widget_menu_itembut(uiWidgetColors *wcol, static void widget_menu_itembut_unpadded(uiWidgetColors *wcol, rcti *rect, - uint64_t UNUSED(state), + int UNUSED(state), int UNUSED(roundboxalign), const float zoom) { @@ -4114,7 +4088,7 @@ static void widget_menu_itembut_unpadded(uiWidgetColors *wcol, static void widget_menu_radial_itembut(uiBut *but, uiWidgetColors *wcol, rcti *rect, - uint64_t UNUSED(state), + int UNUSED(state), int UNUSED(roundboxalign), const float zoom) { @@ -4140,7 +4114,7 @@ static void widget_menu_radial_itembut(uiBut *but, static void widget_list_itembut(uiWidgetColors *wcol, rcti *rect, - uint64_t UNUSED(state), + int UNUSED(state), int UNUSED(roundboxalign), const float zoom) { @@ -4157,7 +4131,7 @@ static void widget_list_itembut(uiWidgetColors *wcol, static void widget_optionbut(uiWidgetColors *wcol, rcti *rect, - uint64_t state, + int state, int UNUSED(roundboxalign), const float UNUSED(zoom)) { @@ -4203,10 +4177,7 @@ static void widget_optionbut(uiWidgetColors *wcol, } /* labels use Editor theme colors for text */ -static void widget_state_label(uiWidgetType *wt, - uint64_t state, - int drawflag, - eUIEmbossType emboss) +static void widget_state_label(uiWidgetType *wt, int state, int drawflag, eUIEmbossType emboss) { if (state & UI_BUT_LIST_ITEM) { /* Override default label theme's colors. */ @@ -4233,7 +4204,7 @@ static void widget_state_label(uiWidgetType *wt, } static void widget_radiobut( - uiWidgetColors *wcol, rcti *rect, uint64_t UNUSED(state), int roundboxalign, const float zoom) + uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign, const float zoom) { uiWidgetBase wtb; widget_init(&wtb); @@ -4247,7 +4218,7 @@ static void widget_radiobut( static void widget_box(uiBut *but, uiWidgetColors *wcol, rcti *rect, - uint64_t UNUSED(state), + int UNUSED(state), int roundboxalign, const float zoom) { @@ -4274,7 +4245,7 @@ static void widget_box(uiBut *but, } static void widget_but( - uiWidgetColors *wcol, rcti *rect, uint64_t UNUSED(state), int roundboxalign, const float zoom) + uiWidgetColors *wcol, rcti *rect, int UNUSED(state), int roundboxalign, const float zoom) { uiWidgetBase wtb; widget_init(&wtb); @@ -4301,7 +4272,7 @@ static void widget_roundbut(uiWidgetColors *wcol, rcti *rect, int UNUSED(state), #endif static void widget_roundbut_exec( - uiWidgetColors *wcol, rcti *rect, uint64_t state, int roundboxalign, const float zoom) + uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign, const float zoom) { uiWidgetBase wtb; widget_init(&wtb); @@ -4320,7 +4291,7 @@ static void widget_roundbut_exec( } static void widget_tab( - uiWidgetColors *wcol, rcti *rect, uint64_t state, int roundboxalign, const float zoom) + uiWidgetColors *wcol, rcti *rect, int state, int roundboxalign, const float zoom) { const float rad = widget_radius_from_zoom(zoom, wcol); const bool is_active = (state & UI_SELECT); @@ -4951,7 +4922,7 @@ void ui_draw_but(const bContext *C, struct ARegion *region, uiStyle *style, uiBu const int roundboxalign = widget_roundbox_set(but, rect); /* Mask out flags re-used for local state. */ - uint64_t state = but->flag & ~UI_STATE_FLAGS_ALL; + int state = but->flag & ~UI_STATE_FLAGS_ALL; const int drawflag = but->drawflag; if (state & UI_SELECT_DRAW) { @@ -5364,7 +5335,7 @@ void ui_draw_menu_item(const uiFontStyle *fstyle, rcti *rect, const char *name, int iconid, - uint64_t state, + int state, uiMenuItemSeparatorType separator_type, int *r_xmax) { @@ -5557,7 +5528,7 @@ void ui_draw_preview_item(const uiFontStyle *fstyle, rcti *rect, const char *name, int iconid, - uint64_t state, + int state, eFontStyle_Align text_align) { uiWidgetType *wt = widget_type(UI_WTYPE_MENU_ITEM_UNPADDED); |