archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Bug fix 1432;

Browse Source 
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!
This commit is contained in:
Ton Roosendaal
2004-10-12 09:06:28 +00:00
parent be32f6d5b8
commit 2521a8b577
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/src/interface.c
View File

@@ -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) {