griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: replace magic numbers with event value, improve function name

Browse Source 
Use a more concise name for event type conversion.
This commit is contained in:
Campbell Barton
2024-02-08 16:57:36 +11:00
parent b28e6751f9
commit 000bed915d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/makesrna/intern/rna_wm_api.cc
View File

@@ -123,10 +123,10 @@ static bool rna_event_modal_handler_add(bContext *C, ReportList *reports, wmOper
return WM_event_add_modal_handler_ex(win, area, region, op) != nullptr;
}
/* XXX, need a way for python to know event types, 0x0110 is hard coded */
static wmTimer *rna_event_timer_add(wmWindowManager *wm, float time_step, wmWindow *win)
{
return WM_event_timer_add(wm, win, 0x0110, time_step);
/* NOTE: we need a way for Python to know event types, `TIMER` is hard coded. */
return WM_event_timer_add(wm, win, TIMER, time_step);
}
static void rna_event_timer_remove(wmWindowManager *wm, wmTimer *timer)

6
source/blender/windowmanager/intern/wm_event_system.cc
View File

@@ -874,7 +874,7 @@ void wm_event_handler_ui_cancel_ex(bContext *C,
wmEvent event;
wm_event_init_from_window(win, &event);
event.type = EVT_BUT_CANCEL;
event.val = reactivate_button ? 0 : 1;
event.val = reactivate_button ? KM_NOTHING : KM_PRESS;
event.flag = (eWM_EventFlag)0;
handler->handle_fn(C, &event, handler->user_data);
}
@@ -4888,7 +4888,7 @@ void WM_event_add_mousemove(wmWindow *win)
/**
* \return The WM enum for key or #EVENT_NONE (which should be ignored).
*/
static int convert_key(GHOST_TKey key)
static int wm_event_type_from_ghost_key(GHOST_TKey key)
{
if (key >= GHOST_kKeyA && key <= GHOST_kKeyZ) {
return (EVT_AKEY + (int(key) - GHOST_kKeyA));
@@ -5683,7 +5683,7 @@ void wm_event_add_ghostevent(wmWindowManager *wm,
case GHOST_kEventKeyDown:
case GHOST_kEventKeyUp: {
const GHOST_TEventKeyData *kd = static_cast<const GHOST_TEventKeyData *>(customdata);
event.type = convert_key(kd->key);
event.type = wm_event_type_from_ghost_key(kd->key);
if (UNLIKELY(event.type == EVENT_NONE)) {
break;
}