diff options
| author | Ton Roosendaal <ton@blender.org> | 2010-12-05 15:14:02 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2010-12-05 15:14:02 +0300 |
| commit | c98f5b2e4b3e1cc123ad0485a9d36e83cbeabb33 (patch) | |
| tree | 42121cc389d82f71e073961276b581c6df336293 /source | |
| parent | 57d1d4f78c548bb38360b4ff3d3388d9343231c7 (diff) | |
Bug fix #25042
Emulate numpad option: failed to use zero key to reset color picker.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 8724b7fad28..35aa351dc20 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -3062,7 +3062,8 @@ static int ui_do_but_HSVCUBE(bContext *C, uiBlock *block, uiBut *but, uiHandleBu return WM_UI_HANDLER_BREAK; } - else if (event->type == ZEROKEY && event->val == KM_PRESS) { + /* XXX hardcoded keymap check.... */ + else if (ELEM(event->type, ZEROKEY, PAD0) && event->val == KM_PRESS) { if (but->a1==UI_GRAD_V_ALT){ int len; @@ -3183,7 +3184,8 @@ static int ui_do_but_HSVCIRCLE(bContext *C, uiBlock *block, uiBut *but, uiHandle return WM_UI_HANDLER_BREAK; } - else if (event->type == ZEROKEY && event->val == KM_PRESS) { + /* XXX hardcoded keymap check.... */ + else if (ELEM(event->type, ZEROKEY, PAD0) && event->val == KM_PRESS) { int len; /* reset only saturation */ @@ -3628,7 +3630,8 @@ static int ui_do_but_HISTOGRAM(bContext *C, uiBlock *block, uiBut *but, uiHandle return WM_UI_HANDLER_BREAK; } - else if (event->type == ZEROKEY && event->val == KM_PRESS) { + /* XXX hardcoded keymap check.... */ + else if (ELEM(event->type, ZEROKEY, PAD0) && event->val == KM_PRESS) { Histogram *hist = (Histogram *)but->poin; hist->ymax = 1.f; @@ -3710,7 +3713,8 @@ static int ui_do_but_WAVEFORM(bContext *C, uiBlock *block, uiBut *but, uiHandleB return WM_UI_HANDLER_BREAK; } - else if (event->type == ZEROKEY && event->val == KM_PRESS) { + /* XXX hardcoded keymap check.... */ + else if (ELEM(event->type, ZEROKEY, PAD0) && event->val == KM_PRESS) { Scopes *scopes = (Scopes *)but->poin; scopes->wavefrm_yfac = 1.f; @@ -4336,7 +4340,8 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, wmEvent *event) return WM_UI_HANDLER_BREAK; } /* reset to default */ - else if(ELEM(event->type, ZEROKEY,PAD0) && event->val == KM_PRESS) { + /* XXX hardcoded keymap check.... */ + else if(ELEM(event->type, ZEROKEY, PAD0) && event->val == KM_PRESS) { if (!(ELEM3(but->type, HSVCIRCLE, HSVCUBE, HISTOGRAM))) ui_set_but_default(C, but); } |