diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-03-05 06:42:48 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-03-05 06:44:28 +0300 |
commit | 23dfcc5ac7edcc374c94a0b7317a7c410bf1fb41 (patch) | |
tree | a40c4a8b833c5ffd5b0c5b9f81624bfb8441ed5a /source/blender/editors/interface/interface_region_menu_pie.c | |
parent | aa8671024223368b0a4ef38c5229c270f50f2902 (diff) |
Cleanup: rename event to event_type
Reserve `event` for wmEvent.
Diffstat (limited to 'source/blender/editors/interface/interface_region_menu_pie.c')
-rw-r--r-- | source/blender/editors/interface/interface_region_menu_pie.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/interface/interface_region_menu_pie.c b/source/blender/editors/interface/interface_region_menu_pie.c index 81c627816b9..05aa139e055 100644 --- a/source/blender/editors/interface/interface_region_menu_pie.c +++ b/source/blender/editors/interface/interface_region_menu_pie.c @@ -122,26 +122,26 @@ uiPieMenu *UI_pie_menu_begin(struct bContext *C, const char *title, int icon, co * it is always assumed to be click style */ if (event->type == LEFTMOUSE || ELEM(event->val, KM_RELEASE, KM_CLICK)) { pie->block_radial->pie_data.flags |= UI_PIE_CLICK_STYLE; - pie->block_radial->pie_data.event = EVENT_NONE; - win->lock_pie_event = EVENT_NONE; + pie->block_radial->pie_data.event_type = EVENT_NONE; + win->pie_event_type_lock = EVENT_NONE; } else { - if (win->last_pie_event != EVENT_NONE) { + if (win->pie_event_type_last != EVENT_NONE) { /* original pie key has been released, so don't propagate the event */ - if (win->lock_pie_event == EVENT_NONE) { + if (win->pie_event_type_lock == EVENT_NONE) { event_type = EVENT_NONE; pie->block_radial->pie_data.flags |= UI_PIE_CLICK_STYLE; } else { - event_type = win->last_pie_event; + event_type = win->pie_event_type_last; } } else { event_type = event->type; } - pie->block_radial->pie_data.event = event_type; - win->lock_pie_event = event_type; + pie->block_radial->pie_data.event_type = event_type; + win->pie_event_type_lock = event_type; } pie->layout = UI_block_layout( |