From 8a8424021c6bd7666375b5d93804c2693fab4a0d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 1 Mar 2022 11:59:21 +1100 Subject: Cleanup: move Event.is_repeat & is_direction_inverted to flags Use a flag for events to avoid adding struct members every time a new kind of tag is needed - so events remain small. This also simplifies copying settings as flags can be copied at once with a mask. --- source/blender/editors/interface/interface.c | 2 +- source/blender/editors/interface/interface_handlers.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/editors/interface') diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index bbd2a64bab4..3619a7ce317 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -6529,7 +6529,7 @@ void UI_but_focus_on_enter_event(wmWindow *win, uiBut *but) event.type = EVT_BUT_OPEN; event.val = KM_PRESS; - event.is_repeat = false; + event.flag = 0; event.customdata = but; event.customdata_free = false; diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 3d92cd6c397..c277ca2e36b 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -8974,7 +8974,7 @@ void ui_but_activate_event(bContext *C, ARegion *region, uiBut *but) wm_event_init_from_window(win, &event); event.type = EVT_BUT_OPEN; event.val = KM_PRESS; - event.is_repeat = false; + event.flag = 0; event.customdata = but; event.customdata_free = false; @@ -9538,7 +9538,7 @@ static int ui_handle_list_event(bContext *C, const wmEvent *event, ARegion *regi ui_pan_to_scroll(event, &type, &val); /* 'ui_pan_to_scroll' gives the absolute direction. */ - if (event->is_direction_inverted) { + if (event->flag & WM_EVENT_SCROLL_INVERT) { scroll_dir = -1; } @@ -10459,7 +10459,7 @@ static int ui_handle_menu_event(bContext *C, /* Only respond to explicit press to avoid the event that opened the menu * activating an item when the key is held. */ - if (event->is_repeat) { + if (event->flag & WM_EVENT_IS_REPEAT) { break; } @@ -10546,7 +10546,7 @@ static int ui_handle_menu_event(bContext *C, ((event->modifier & (KM_SHIFT | KM_CTRL | KM_OSKEY)) == 0) && /* Only respond to explicit press to avoid the event that opened the menu * activating an item when the key is held. */ - !event->is_repeat) { + (event->flag & WM_EVENT_IS_REPEAT) == 0) { if (ui_menu_pass_event_to_parent_if_nonactive(menu, but, level, retval)) { break; } -- cgit v1.2.3