Standarizing on control for unconditionally entering keyboard input edit mode.
authorGuillermo S. Romero <gsr.b3d@infernal-iceberg.com>
Sun, 14 Jun 2009 20:26:20 +0000 (20:26 +0000)
committerGuillermo S. Romero <gsr.b3d@infernal-iceberg.com>
Sun, 14 Jun 2009 20:26:20 +0000 (20:26 +0000)
(Outliner uses this because shift is used for multiple select)

source/blender/editors/interface/interface_handlers.c

index 0f6dbc430fb50e6b27d7d7d93ac27bdceb85e308..6ec809b71781757d503a212f7779a63d91241cd5 100644 (file)
@@ -1774,7 +1774,7 @@ static int ui_do_but_NUM(bContext *C, uiBlock *block, uiBut *but, uiHandleButton
                        click= 1;
                }
                else if(event->val==KM_PRESS) {
-                       if(ELEM3(event->type, LEFTMOUSE, PADENTER, RETKEY) && event->shift) {
+                       if(ELEM3(event->type, LEFTMOUSE, PADENTER, RETKEY) && event->ctrl) {
                                button_activate_state(C, but, BUTTON_STATE_TEXT_EDITING);
                                retval= WM_UI_HANDLER_BREAK;
                        }
@@ -1985,7 +1985,7 @@ static int ui_do_but_SLI(bContext *C, uiBlock *block, uiBut *but, uiHandleButton
                        click= 2;
                }
                else if(event->val==KM_PRESS) {
-                       if(ELEM3(event->type, LEFTMOUSE, PADENTER, RETKEY) && event->shift) {
+                       if(ELEM3(event->type, LEFTMOUSE, PADENTER, RETKEY) && event->ctrl) {
                                button_activate_state(C, but, BUTTON_STATE_TEXT_EDITING);
                                retval= WM_UI_HANDLER_BREAK;
                        }
@@ -2027,7 +2027,7 @@ static int ui_do_but_SLI(bContext *C, uiBlock *block, uiBut *but, uiHandleButton
        }
 
        if(click) {
-               if (event->ctrl || click==2) {
+               if (click==2) {
                        /* nudge slider to the left or right */
                        float f, tempf, softmin, softmax, softrange;
                        int temp;