diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-10-12 13:06:28 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-10-12 13:06:28 +0400 |
| commit | 2521a8b577e49124d8dd8d47e355f5a26e7adfd1 (patch) | |
| tree | cd769167e3b5d482b0b815382e2cb611123cb9db /source/blender/src/interface.c | |
| parent | be32f6d5b8f9ec06718bb107a2cd7e648636a6b7 (diff) | |
Bug fix 1432;
When you PAD-enter on a popup-number button (like for add circle) it
accidentally de/increased the value before assigning an "OK". Fixed.
Also: restored functionality that allows to use Enter keys as a mouse
button click. This de/increases values now, opens menus, etc. Not in
pupup or pulldown menus though!
Diffstat (limited to 'source/blender/src/interface.c')
| -rw-r--r-- | source/blender/src/interface.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c index e36495ac596..83738c54731 100644 --- a/source/blender/src/interface.c +++ b/source/blender/src/interface.c @@ -2934,7 +2934,7 @@ static int ui_do_block(uiBlock *block, uiEvent *uevent) if(uevent==0 || uevent->event==LEFTSHIFTKEY || uevent->event==RIGHTSHIFTKEY) return UI_NOTHING; if(block->flag & UI_BLOCK_ENTER_OK) { - if(uevent->event == RETKEY && uevent->val) { + if((uevent->event==RETKEY || uevent->event==PADENTER) && uevent->val) { // printf("qual: %d %d %d\n", uevent->qual, get_qual(), G.qual); if ((G.qual & LR_SHIFTKEY) == 0) { return UI_RETURN_OK; @@ -3007,9 +3007,6 @@ static int ui_do_block(uiBlock *block, uiEvent *uevent) case RIGHTARROWKEY: break; - case RETKEY: // prevent treating this as mousemove. for example when you enter at popup - break; - case PAD8: case PAD2: case UPARROWKEY: case DOWNARROWKEY: @@ -3122,6 +3119,11 @@ static int ui_do_block(uiBlock *block, uiEvent *uevent) if(but->retval==uevent->val) but->flag |= UI_ACTIVE; } break; + + case PADENTER: + case RETKEY: // prevent treating this as mousemove. for example when you enter at popup + if(block->flag & UI_BLOCK_LOOP) break; + default: for(but= block->buttons.first; but; but= but->next) { |